Browse Source

Correct deprecated regex format (1)

pull/1413/head
Safihre 5 years ago
parent
commit
efcb09a5b7
  1. 2
      SABnzbd.py
  2. 18
      sabnzbd/misc.py

2
SABnzbd.py

@ -634,7 +634,7 @@ def is_sabnzbd_running(url):
prev = sabnzbd.set_https_verification(False) prev = sabnzbd.set_https_verification(False)
ver = get_from_url(url) ver = get_from_url(url)
sabnzbd.set_https_verification(prev) 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: except:
return False return False

18
sabnzbd/misc.py

@ -286,7 +286,7 @@ def get_from_url(url):
""" Retrieve URL and return content """ """ Retrieve URL and return content """
try: try:
with urllib.request.urlopen(url) as response: with urllib.request.urlopen(url) as response:
return response.read() return ubtou(response.read())
except: except:
return None return None
@ -348,22 +348,20 @@ def check_latest_version():
logging.debug("Traceback: ", exc_info=True) logging.debug("Traceback: ", exc_info=True)
return return
version_data = data.split()
try: try:
latest_label = data.split()[0] latest_label = version_data[0]
url = version_data[1]
except: except:
latest_label = "" latest_label = ""
try:
url = ubtou(data.split()[1])
except:
url = "" url = ""
try: try:
latest_testlabel = data.split()[2] latest_testlabel = version_data[2]
url_beta = version_data[3]
except: except:
latest_testlabel = "" latest_testlabel = ""
try: url_beta = ""
url_beta = ubtou(data.split()[3])
except:
url_beta = url
latest = convert_version(latest_label)[0] latest = convert_version(latest_label)[0]
latest_test = convert_version(latest_testlabel)[0] latest_test = convert_version(latest_testlabel)[0]

Loading…
Cancel
Save