From 9eac8e2bd3ad48747f60c85b9320d3c9a4166658 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 3 Apr 2018 23:42:02 -0700 Subject: [PATCH] prefer python3 when running wakatime-cli --- WakaTime.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/WakaTime.py b/WakaTime.py index 09443ca..a8ff4a5 100644 --- a/WakaTime.py +++ b/WakaTime.py @@ -305,13 +305,15 @@ def find_python_from_registry(location, reg=None): return val -def find_python_in_folder(folder, headless=True): +def find_python_in_folder(folder, python3=True, headless=True): pattern = re.compile(r'\d+\.\d+') path = 'python' - if folder is not None: + if folder: path = os.path.realpath(os.path.join(folder, 'python')) - if headless: + if python3: + path = u(path) + u('3') + elif headless: path = u(path) + u('w') log(DEBUG, u('Looking for Python at: {0}').format(u(path))) try: @@ -325,9 +327,13 @@ def find_python_in_folder(folder, headless=True): except: log(DEBUG, u(sys.exc_info()[1])) - if headless: - path = find_python_in_folder(folder, headless=False) - if path is not None: + if python3: + path = find_python_in_folder(folder, python3=False, headless=headless) + if path: + return path + elif headless: + path = find_python_in_folder(folder, python3=python3, headless=False) + if path: return path return None