From 375696a2478fa8e3280242c4a39c43940ce498a5 Mon Sep 17 00:00:00 2001 From: Patrick Kenny Date: Thu, 15 Dec 2016 11:42:53 -0500 Subject: Update to update code. Adds try to urlopen call instead of just dialog box, fixes #264 and #230. --- dwt_about.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dwt_about.py b/dwt_about.py index 9e44835..f68f7fc 100644 --- a/dwt_about.py +++ b/dwt_about.py @@ -167,13 +167,16 @@ class Licenses(wx.Dialog): def update_check(parent): - r = urllib2.urlopen('https://api.github.com/repos/10se1ucgo/DisableWinTracking/releases/latest') - value, parameters = cgi.parse_header(r.headers.get('Content-Type', '')) - release = json.loads(r.read().decode(parameters.get('charset', 'utf-8'))) - if release['prerelease']: - return - new = release['tag_name'] - + try: + r = urllib2.urlopen('https://api.github.com/repos/10se1ucgo/DisableWinTracking/releases/latest') + value, parameters = cgi.parse_header(r.headers.get('Content-Type', '')) + release = json.loads(r.read().decode(parameters.get('charset', 'utf-8'))) + if release['prerelease']: + return + new = release['tag_name'] + except URLError: + pass + try: if StrictVersion(__version__) < StrictVersion(new.lstrip('v')): info = wx.MessageDialog(parent, message="DWT {v} is now available!\nGo to download page?".format(v=new), -- cgit v1.2.3 From 1249db58bc6e21904b12c59a743604a43e4ddc5a Mon Sep 17 00:00:00 2001 From: Patrick Kenny Date: Mon, 19 Dec 2016 21:28:23 -0500 Subject: Fixes issues with update code patch. Also fixes consistency issue between what @10se1ucgo says and what is actually in the code(removing pass). --- dwt_about.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dwt_about.py b/dwt_about.py index f68f7fc..1c95a13 100644 --- a/dwt_about.py +++ b/dwt_about.py @@ -169,13 +169,13 @@ class Licenses(wx.Dialog): def update_check(parent): try: r = urllib2.urlopen('https://api.github.com/repos/10se1ucgo/DisableWinTracking/releases/latest') - value, parameters = cgi.parse_header(r.headers.get('Content-Type', '')) - release = json.loads(r.read().decode(parameters.get('charset', 'utf-8'))) - if release['prerelease']: - return - new = release['tag_name'] except URLError: - pass + return + value, parameters = cgi.parse_header(r.headers.get('Content-Type', '')) + release = json.loads(r.read().decode(parameters.get('charset', 'utf-8'))) + if release['prerelease']: + return + new = release['tag_name'] try: if StrictVersion(__version__) < StrictVersion(new.lstrip('v')): @@ -185,4 +185,4 @@ def update_check(parent): webbrowser.open_new_tab(release['html_url']) info.Destroy() except ValueError: - pass + return -- cgit v1.2.3