From efcb09a5b7555a87ab5b44a803360663a20f6e45 Mon Sep 17 00:00:00 2001 From: Safihre Date: Thu, 30 Apr 2020 15:12:21 +0200 Subject: [PATCH] Correct deprecated regex format (1) --- SABnzbd.py | 2 +- sabnzbd/misc.py | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/SABnzbd.py b/SABnzbd.py index d316d9d..eb0fe82 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -634,7 +634,7 @@ def is_sabnzbd_running(url): prev = sabnzbd.set_https_verification(False) ver = get_from_url(url) sabnzbd.set_https_verification(prev) - return ver and (re.search(b'\d+\.\d+\.', ver) or ver.strip() == sabnzbd.__version__) + return ver and (re.search(r'\d+\.\d+\.', ver) or ver.strip() == sabnzbd.__version__) except: return False diff --git a/sabnzbd/misc.py b/sabnzbd/misc.py index ecc645c..6fac006 100644 --- a/sabnzbd/misc.py +++ b/sabnzbd/misc.py @@ -286,7 +286,7 @@ def get_from_url(url): """ Retrieve URL and return content """ try: with urllib.request.urlopen(url) as response: - return response.read() + return ubtou(response.read()) except: return None @@ -348,28 +348,26 @@ def check_latest_version(): logging.debug("Traceback: ", exc_info=True) return + version_data = data.split() try: - latest_label = data.split()[0] + latest_label = version_data[0] + url = version_data[1] except: latest_label = "" - try: - url = ubtou(data.split()[1]) - except: url = "" + try: - latest_testlabel = data.split()[2] + latest_testlabel = version_data[2] + url_beta = version_data[3] except: latest_testlabel = "" - try: - url_beta = ubtou(data.split()[3]) - except: - url_beta = url + url_beta = "" latest = convert_version(latest_label)[0] latest_test = convert_version(latest_testlabel)[0] logging.debug( - "Checked for a new release, cur= %s, latest= %s (on %s), latest_test= %s (on %s)", + "Checked for a new release, cur=%s, latest=%s (on %s), latest_test=%s (on %s)", current, latest, url,