diff -r 35b46e640d6d -r 2de720476713 PluginPyLint.py
--- a/PluginPyLint.py Sun Dec 31 16:59:08 2017 +0100
+++ b/PluginPyLint.py Sun Jan 21 14:31:01 2018 +0100
@@ -35,7 +35,7 @@
author = "Detlev Offenbach <detlev@die-offenbachs.de>"
autoactivate = True
deactivateable = True
-version = "6.1.7"
+version = "6.1.8"
className = "PyLintPlugin"
packageName = "PyLint"
shortDescription = "Show the PyLint dialogs."
@@ -153,37 +153,40 @@
pass
return exes
+ versionSuffixes = ["", "-32", "-64"]
for minorVersion in minorVersions:
- versionStr = '{0}.{1}'.format(majorVersion, minorVersion)
- exePaths = getExePath(
- winreg.HKEY_CURRENT_USER,
- winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr)
- if exePaths:
- for exePath in exePaths:
- executables.add(exePath)
-
- exePaths = getExePath(
- winreg.HKEY_LOCAL_MACHINE,
- winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr)
- if exePaths:
- for exePath in exePaths:
- executables.add(exePath)
-
- # Even on Intel 64-bit machines it's 'AMD64'
- if platform.machine() == 'AMD64':
+ for versionSuffix in versionSuffixes:
+ versionStr = '{0}.{1}{2}'.format(majorVersion, minorVersion,
+ versionSuffix)
exePaths = getExePath(
winreg.HKEY_CURRENT_USER,
- winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr)
+ winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr)
if exePaths:
for exePath in exePaths:
executables.add(exePath)
- exePath = getExePath(
+ exePaths = getExePath(
winreg.HKEY_LOCAL_MACHINE,
- winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr)
+ winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr)
if exePaths:
for exePath in exePaths:
executables.add(exePath)
+
+ # Even on Intel 64-bit machines it's 'AMD64'
+ if platform.machine() == 'AMD64':
+ exePaths = getExePath(
+ winreg.HKEY_CURRENT_USER,
+ winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr)
+ if exePaths:
+ for exePath in exePaths:
+ executables.add(exePath)
+
+ exePath = getExePath(
+ winreg.HKEY_LOCAL_MACHINE,
+ winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr)
+ if exePaths:
+ for exePath in exePaths:
+ executables.add(exePath)
else:
#
# Linux, Unix ...
@@ -210,22 +213,22 @@
exes.append(exe)
# step 2: determine the Python variant
- if Utilities.isMacPlatform():
- checkStrings = ["Python.framework/Versions/3".lower(),
- "python3", "python"]
- else:
- checkStrings = ["python3"]
-
_exePy2 = set()
_exePy3 = set()
+ versionArgs = ["-c", "import sys; print(sys.version_info[0])"]
for exe in exes:
try:
f = open(exe, "r")
line0 = f.readline()
- for checkStr in checkStrings:
- if checkStr in line0.lower():
- _exePy3.add(exe)
- break
+ program = line0.replace("#!", "").strip()
+ process = QProcess()
+ process.start(program, versionArgs)
+ process.waitForFinished(5000)
+ # get a QByteArray of the output
+ versionBytes = process.readAllStandardOutput()
+ versionStr = str(versionBytes, encoding='utf-8').strip()
+ if versionStr == "3":
+ _exePy3.add(exe)
else:
_exePy2.add(exe)
finally:
