| OLD | NEW |
| 1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) | 1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions | 4 # modification, are permitted provided that the following conditions |
| 5 # are met: | 5 # are met: |
| 6 # 1. Redistributions of source code must retain the above copyright | 6 # 1. Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # 2. Redistributions in binary form must reproduce the above copyright | 8 # 2. Redistributions in binary form must reproduce the above copyright |
| 9 # notice, this list of conditions and the following disclaimer in the | 9 # notice, this list of conditions and the following disclaimer in the |
| 10 # documentation and/or other materials provided with the distribution. | 10 # documentation and/or other materials provided with the distribution. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 output = self.run_pylint(self._file_path) | 69 output = self.run_pylint(self._file_path) |
| 70 errors = self._parse_pylint_output(output) | 70 errors = self._parse_pylint_output(output) |
| 71 for line_number, category, message in errors: | 71 for line_number, category, message in errors: |
| 72 self._handle_style_error(line_number, category, 5, message) | 72 self._handle_style_error(line_number, category, 5, message) |
| 73 | 73 |
| 74 def run_pylint(self, path): | 74 def run_pylint(self, path): |
| 75 wkf = WebKitFinder(FileSystem()) | 75 wkf = WebKitFinder(FileSystem()) |
| 76 executive = Executive() | 76 executive = Executive() |
| 77 env = os.environ.copy() | 77 env = os.environ.copy() |
| 78 env['PYTHONPATH'] = os.pathsep.join([ | 78 env['PYTHONPATH'] = os.pathsep.join([ |
| 79 wkf.path_from_webkit_base('Tools', 'Scripts'), | 79 wkf.path_from_tools_scripts(), |
| 80 wkf.path_from_webkit_base('Source', 'build', 'scripts'), | 80 wkf.path_from_blink_source('build', 'scripts'), |
| 81 wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdpart
y'), | 81 wkf.path_from_tools_scripts('webkitpy', 'thirdparty'), |
| 82 wkf.path_from_webkit_base('Source', 'bindings', 'scripts'), | 82 wkf.path_from_blink_source('bindings', 'scripts'), |
| 83 wkf.path_from_chromium_base('build', 'android'), | 83 wkf.path_from_chromium_base('build', 'android'), |
| 84 wkf.path_from_chromium_base('third_party', 'catapult', 'devil'), | 84 wkf.path_from_chromium_base('third_party', 'catapult', 'devil'), |
| 85 wkf.path_from_chromium_base('third_party', 'pymock'), | 85 wkf.path_from_chromium_base('third_party', 'pymock'), |
| 86 ]) | 86 ]) |
| 87 return executive.run_command([ | 87 return executive.run_command([ |
| 88 sys.executable, | 88 sys.executable, |
| 89 wkf.path_from_depot_tools_base('pylint.py'), | 89 wkf.path_from_depot_tools_base('pylint.py'), |
| 90 '--output-format=parseable', | 90 '--output-format=parseable', |
| 91 '--rcfile=' + wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitp
y', 'pylintrc'), | 91 '--rcfile=' + wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitp
y', 'pylintrc'), |
| 92 path, | 92 path, |
| (...skipping 24 matching lines...) Expand all Loading... |
| 117 | 117 |
| 118 line_number = int(match_obj.group(2)) | 118 line_number = int(match_obj.group(2)) |
| 119 category_and_method = match_obj.group(3).split(', ') | 119 category_and_method = match_obj.group(3).split(', ') |
| 120 category = 'pylint/' + (category_and_method[0]) | 120 category = 'pylint/' + (category_and_method[0]) |
| 121 if len(category_and_method) > 1: | 121 if len(category_and_method) > 1: |
| 122 message = '[%s] %s' % (category_and_method[1], match_obj.group(4
)) | 122 message = '[%s] %s' % (category_and_method[1], match_obj.group(4
)) |
| 123 else: | 123 else: |
| 124 message = match_obj.group(4) | 124 message = match_obj.group(4) |
| 125 errors.append((line_number, category, message)) | 125 errors.append((line_number, category, message)) |
| 126 return errors | 126 return errors |
| OLD | NEW |