OLD | NEW |
(Empty) | |
| 1 URL: http://www.pylint.org/ |
| 2 Name: pylint |
| 3 Version: 1.4.1 |
| 4 License: GPL v2 |
| 5 License File: pylint/LICENSE.txt |
| 6 Security Critical: No |
| 7 |
| 8 Description: |
| 9 This directory contains the pylint module. |
| 10 |
| 11 Local Modifications: |
| 12 - applied upstream fix https://bitbucket.org/logilab/pylint/commits/5df347467ee0 |
| 13 - applied fix to work around bad interaction between sys.path manipulation in |
| 14 pylint itself and multiprocessing's implementation on Windows (DIFF1) |
| 15 |
| 16 |
| 17 Diffs: |
| 18 DIFF1 |
| 19 diff --git a/third_party/pylint/lint.py b/third_party/pylint/lint.py |
| 20 index e10ae56..082d8b3 100644 |
| 21 --- a/third_party/pylint/lint.py |
| 22 +++ b/third_party/pylint/lint.py |
| 23 @@ -671,7 +671,8 @@ class PyLinter(configuration.OptionsManagerMixIn, |
| 24 files_or_modules = (files_or_modules,) |
| 25 |
| 26 if self.config.jobs == 1: |
| 27 - self._do_check(files_or_modules) |
| 28 + with fix_import_path(files_or_modules): |
| 29 + self._do_check(files_or_modules) |
| 30 else: |
| 31 # Hack that permits running pylint, on Windows, with -m switch |
| 32 # and with --jobs, as in 'python -2 -m pylint .. --jobs'. |
| 33 @@ -1252,8 +1253,8 @@ group are mutually exclusive.'), |
| 34 |
| 35 # insert current working directory to the python path to have a correct |
| 36 # behaviour |
| 37 - with fix_import_path(args): |
| 38 - if self.linter.config.profile: |
| 39 + if self.linter.config.profile: |
| 40 + with fix_import_path(args): |
| 41 print('** profiled run', file=sys.stderr) |
| 42 import cProfile, pstats |
| 43 cProfile.runctx('linter.check(%r)' % args, globals(), locals(), |
| 44 @@ -1262,9 +1263,9 @@ group are mutually exclusive.'), |
| 45 data.strip_dirs() |
| 46 data.sort_stats('time', 'calls') |
| 47 data.print_stats(30) |
| 48 - else: |
| 49 - linter.check(args) |
| 50 - linter.generate_reports() |
| 51 + else: |
| 52 + linter.check(args) |
| 53 + linter.generate_reports() |
| 54 if exit: |
| 55 sys.exit(self.linter.msg_status) |
OLD | NEW |