From b4fc2b70345e67b1d1984a09eeeb720bc3e8db3c Mon Sep 17 00:00:00 2001 From: Dee Jayh Date: Sun, 30 Apr 2017 16:26:28 -0400 Subject: modified: dwt_util.py --- dwt_util.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dwt_util.py b/dwt_util.py index 630d347..1af2b72 100644 --- a/dwt_util.py +++ b/dwt_util.py @@ -85,7 +85,7 @@ def ip_block(ip_list, undo): def clear_diagtrack(): file = os.path.join(os.environ['SYSTEMDRIVE'], ('\\ProgramData\\Microsoft\\Diagnosis\\ETLLogs\\AutoLogger\\AutoLogger-Diagtrack-Listener.etl')) - + ''' This is an ORDERED dictionary. It will always run in order, not subject to the devastation of a standard dictionary, so no worries. @@ -94,9 +94,9 @@ def clear_diagtrack(): cmds["takeown /f {0}".format(file)]="Take Ownership" cmds["icacls {0} /grant administrators:F".format(file)]="Grant Admin Privilege" cmds["icacls {0} /inheritance:r /deny SYSTEM:F /grant Administrators:F".format(file)]="Deny System Privilege" - + i = 0 - + for x, y in cmds.iteritems(): i += 1 @@ -112,7 +112,7 @@ def clear_diagtrack(): logger.info("DiagTrack: {0} of AutoLogger-Diagtrack-Listener.etl was successful".format(y)) if p.returncode: - logger.exception(p.returncode.decode()) + logger.exception(p.returncode) if i == 3: logger.info("DiagTrack: Successfully cleared and locked DiagTrack log.") -- cgit v1.2.3 From 14e14abb6fbc53ce1ed23aeb0b96f211945590ad Mon Sep 17 00:00:00 2001 From: Dee Jayh Date: Sun, 30 Apr 2017 16:32:13 -0400 Subject: modified: .gitignore modified: dwt_about.py --- .gitignore | 3 +++ dwt_about.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a8a69ca..b107539 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ dist/ # Log dwt.log +# Resource Files +dwt.res + # Other getapps.py getreleases.py diff --git a/dwt_about.py b/dwt_about.py index 08650c4..1b046f0 100644 --- a/dwt_about.py +++ b/dwt_about.py @@ -26,7 +26,7 @@ import wx import wx.adv import wx.lib.scrolledpanel as sp -__version__ = "3.1.1" +__version__ = "3.1.2" def about_dialog(parent): -- cgit v1.2.3 From 03825512fc74dc20f8613a1376cc819f940af4c0 Mon Sep 17 00:00:00 2001 From: Dee Jayh Date: Fri, 5 May 2017 12:47:42 -0400 Subject: modified: dwt_about.py --- dwt_about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwt_about.py b/dwt_about.py index 1b046f0..1717934 100644 --- a/dwt_about.py +++ b/dwt_about.py @@ -169,7 +169,7 @@ class Licenses(wx.Dialog): def update_check(parent): try: r = urllib2.urlopen('https://api.github.com/repos/10se1ucgo/DisableWinTracking/releases/latest') - except URLError: + except urllib2.URLError: return value, parameters = cgi.parse_header(r.headers.get('Content-Type', '')) release = json.loads(r.read().decode(parameters.get('charset', 'utf-8'))) -- cgit v1.2.3