summaryrefslogtreecommitdiff
path: root/pcr/spyder/pylint.patch
blob: faa1edcf14b963c83cfe2f1ec2b5d7c665ee54cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
diff -Naur spyder-2.2.5/spyderplugins/widgets/pylintgui.py spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py
--- spyder-2.2.5/spyderplugins/widgets/pylintgui.py	2013-10-12 20:35:52.000000000 +0200
+++ spyder-2.2.5-patched/spyderplugins/widgets/pylintgui.py	2013-11-12 00:42:22.809509805 +0100
@@ -40,7 +40,7 @@
 _ = get_translation("p_pylint", dirname="spyderplugins")
 
 
-PYLINT_PATH = programs.find_program('pylint')
+PYLINT_PATH = programs.find_program('pylint2')
 
 
 def get_pylint_version():
@@ -48,13 +48,13 @@
     global PYLINT_PATH
     if PYLINT_PATH is None:
         return
-    process = subprocess.Popen(['pylint', '--version'],
+    process = subprocess.Popen(['pylint2', '--version'],
                                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                cwd=osp.dirname(PYLINT_PATH),
                                shell=True if os.name == 'nt' else False)
     lines = to_unicode_from_fs(process.stdout.read()).splitlines()
     if lines:
-        match = re.match('(pylint|pylint-script.py) ([0-9\.]*)', lines[0])
+        match = re.match('(pylint2|pylint-script.py) ([0-9\.]*)', lines[0])
         if match is not None:
             return match.groups()[1]