Merge branch 'master' into python3

2026-10-02 07:32:32 +00:00 · 2014-01-15 09:33:35 +01:00
parent 89d31cb8e5 cf0b6b3484
commit 3af30faee9
20 changed files with 678 additions and 363 deletions
@@ -26,7 +26,7 @@ import locale
 from sys import platform
 from subprocess import STDOUT, PIPE
 try:
-    #noinspection PyUnresolvedReferences
+    # noinspection PyUnresolvedReferences
    from psutil import Popen
 except ImportError:
    print("ERROR: Psutil is not installed!")