| 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. |
| 11 # | 11 # |
| 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND | 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND |
| 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR | 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR |
| 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
| 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
| 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
| 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 22 | 22 |
| 23 """Supports checking WebKit style in Python files.""" | 23 """Supports checking WebKit style in Python files.""" |
| 24 | 24 |
| 25 import re | 25 import re |
| 26 from StringIO import StringIO | 26 from StringIO import StringIO |
| 27 | 27 |
| 28 from webkitpy.common.system.filesystem import FileSystem | 28 from webkitpy.common.system.filesystem import FileSystem |
| 29 from webkitpy.common.webkit_finder import WebKitFinder | 29 from webkitpy.common.webkit_finder import WebKitFinder |
| 30 from webkitpy.thirdparty.autoinstalled import pep8 | 30 from webkitpy.thirdparty import pep8 |
| 31 from webkitpy.thirdparty.autoinstalled.pylint import lint | 31 from webkitpy.thirdparty.pylint import lint |
| 32 from webkitpy.thirdparty.autoinstalled.pylint.reporters.text import ParseableTex
tReporter | 32 from webkitpy.thirdparty.pylint.reporters.text import ParseableTextReporter |
| 33 | 33 |
| 34 | 34 |
| 35 class PythonChecker(object): | 35 class PythonChecker(object): |
| 36 """Processes text lines for checking style.""" | 36 """Processes text lines for checking style.""" |
| 37 def __init__(self, file_path, handle_style_error): | 37 def __init__(self, file_path, handle_style_error): |
| 38 self._file_path = file_path | 38 self._file_path = file_path |
| 39 self._handle_style_error = handle_style_error | 39 self._handle_style_error = handle_style_error |
| 40 | 40 |
| 41 def check(self, lines): | 41 def check(self, lines): |
| 42 self._check_pep8(lines) | 42 self._check_pep8(lines) |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 def _filter(self, msg): | 119 def _filter(self, msg): |
| 120 if any(bad_message in msg for bad_message in self.bad_messages): | 120 if any(bad_message in msg for bad_message in self.bad_messages): |
| 121 self.dropped_last_msg = True | 121 self.dropped_last_msg = True |
| 122 return True | 122 return True |
| 123 if self.dropped_last_msg: | 123 if self.dropped_last_msg: |
| 124 # We drop the newline after a dropped message as well. | 124 # We drop the newline after a dropped message as well. |
| 125 self.dropped_last_msg = False | 125 self.dropped_last_msg = False |
| 126 if msg == '\n': | 126 if msg == '\n': |
| 127 return True | 127 return True |
| 128 return False | 128 return False |
| OLD | NEW |