| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_webkit_base('Tools', 'Scripts'), |
| 80 wkf.path_from_webkit_base('Source', 'build', 'scripts'), | 80 wkf.path_from_webkit_base('Source', 'build', 'scripts'), |
| 81 wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdpart
y'), | 81 wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdpart
y'), |
| 82 wkf.path_from_webkit_base('Source', 'bindings', 'scripts'), |
| 82 ]) | 83 ]) |
| 83 return executive.run_command([ | 84 return executive.run_command([ |
| 84 sys.executable, | 85 sys.executable, |
| 85 wkf.path_from_depot_tools_base('pylint.py'), | 86 wkf.path_from_depot_tools_base('pylint.py'), |
| 86 '--output-format=parseable', | 87 '--output-format=parseable', |
| 87 '--rcfile=' + wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitp
y', 'pylintrc'), | 88 '--rcfile=' + wkf.path_from_webkit_base('Tools', 'Scripts', 'webkitp
y', 'pylintrc'), |
| 88 path, | 89 path, |
| 89 ], env=env, error_handler=executive.ignore_error) | 90 ], env=env, error_handler=executive.ignore_error) |
| 90 | 91 |
| 91 def _parse_pylint_output(self, output): | 92 def _parse_pylint_output(self, output): |
| (...skipping 21 matching lines...) Expand all Loading... |
| 113 | 114 |
| 114 line_number = int(match_obj.group(2)) | 115 line_number = int(match_obj.group(2)) |
| 115 category_and_method = match_obj.group(3).split(', ') | 116 category_and_method = match_obj.group(3).split(', ') |
| 116 category = 'pylint/' + (category_and_method[0]) | 117 category = 'pylint/' + (category_and_method[0]) |
| 117 if len(category_and_method) > 1: | 118 if len(category_and_method) > 1: |
| 118 message = '[%s] %s' % (category_and_method[1], match_obj.group(4
)) | 119 message = '[%s] %s' % (category_and_method[1], match_obj.group(4
)) |
| 119 else: | 120 else: |
| 120 message = match_obj.group(4) | 121 message = match_obj.group(4) |
| 121 errors.append((line_number, category, message)) | 122 errors.append((line_number, category, message)) |
| 122 return errors | 123 return errors |
| OLD | NEW |