From 9f1d2aa58cec76306c3dc6887e7c9c92769936fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Andr=C3=A9=20Novo?= Date: Sun, 10 Mar 2019 01:26:09 +0100 Subject: Adds Python 3 compatibility --- dwt_util.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'dwt_util.py') diff --git a/dwt_util.py b/dwt_util.py index efc5cc6..62bde2b 100644 --- a/dwt_util.py +++ b/dwt_util.py @@ -20,10 +20,9 @@ import platform from collections import OrderedDict import pywintypes import shutil -from string import split import subprocess import tempfile -import _winreg as winreg +from six.moves import winreg import shlex import win32serviceutil @@ -66,12 +65,12 @@ class CalledProcessError(Exception): def is_64bit(): if os.name == 'nt': - output = subprocess.check_output(['wmic', 'os', 'get', 'OSArchitecture']) - os_arch = output.split()[1] - return True if os_arch == '64-bit' else False + output = subprocess.check_output(['wmic', 'os', 'get', 'OSArchitecture']) + os_arch = output.split()[1] + return True if os_arch == '64-bit' else False else: - logger.critical("This was only meant to be run on Windows-based system. Specifically, Windows 10.") - os._exit(0) + logger.critical("This was only meant to be run on Windows-based system. Specifically, Windows 10.") + os._exit(0) return os_arch @@ -101,7 +100,7 @@ def clear_diagtrack(): failed = False for cmd in cmds: i += 1 - service = split(cmd, 'sc delete ') + service = cmd.split('sc delete ') output = subprocess_handler(cmd) -- cgit v1.2.3