Permalink
Browse files

merge fix

  • Loading branch information...
Rinze de Laat
Rinze de Laat committed Mar 22, 2014
1 parent c042d5f commit 1072f19f5a85b647a102267567ff6772c50896e3
Showing with 12 additions and 7 deletions.
  1. +12 −7 pylinter.py
View
@@ -176,12 +176,17 @@ def get_default_pylint_command(cls):
"""
try:
_ = subprocess.Popen("pylint",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
startupinfo=STARTUPINFO)
speak("Pylint executable found")
return ["pylint"]
python_bin = cls.get_or('python_bin', 'python')
pylint_path = cls.get_or('pylint_path', None)
if pylint_path is None:
_ = subprocess.Popen("pylint",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
startupinfo=STARTUPINFO)
speak("Pylint executable found")
return ["pylint"]
else:
return [python_bin, pylint_path]
except OSError:
speak("Pylint executable *not* found")
speak("Seaching for lint.py module...")
@@ -200,7 +205,7 @@ def get_default_pylint_command(cls):
out, _ = proc.communicate()
pylint_path = ""
pylint_path = None
if out != b"":
pylint_path = os.path.join(out.strip(),
b"lint.py").decode("utf-8")

0 comments on commit 1072f19

Please sign in to comment.