| OLD | NEW |
| 1 # Copyright (C) 2011 Apple Inc. All rights reserved. | 1 # Copyright (C) 2011 Apple Inc. All rights reserved. |
| 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 """Checks WebKit style for JSON files.""" | 23 """Checks WebKit style for JSON files.""" |
| 24 | 24 |
| 25 import json | 25 import json |
| 26 import re | 26 import re |
| 27 | 27 |
| 28 | 28 |
| 29 class JSONChecker(object): | 29 class JSONChecker(object): |
| 30 |
| 30 """Processes JSON lines for checking style.""" | 31 """Processes JSON lines for checking style.""" |
| 31 | 32 |
| 32 categories = set(('json/syntax',)) | 33 categories = set(('json/syntax',)) |
| 33 | 34 |
| 34 def __init__(self, file_path, handle_style_error): | 35 def __init__(self, file_path, handle_style_error): |
| 35 self._handle_style_error = handle_style_error | 36 self._handle_style_error = handle_style_error |
| 36 self._handle_style_error.turn_off_line_filtering() | 37 self._handle_style_error.turn_off_line_filtering() |
| 37 | 38 |
| 38 def check(self, lines): | 39 def check(self, lines): |
| 39 try: | 40 try: |
| 40 json.loads('\n'.join(lines) + '\n') | 41 json.loads('\n'.join(lines) + '\n') |
| 41 except ValueError, e: | 42 except ValueError as e: |
| 42 self._handle_style_error(self.line_number_from_json_exception(e), 'j
son/syntax', 5, str(e)) | 43 self._handle_style_error(self.line_number_from_json_exception(e), 'j
son/syntax', 5, str(e)) |
| 43 | 44 |
| 44 @staticmethod | 45 @staticmethod |
| 45 def line_number_from_json_exception(error): | 46 def line_number_from_json_exception(error): |
| 46 match = re.search(r': line (?P<line>\d+) column \d+', str(error)) | 47 match = re.search(r': line (?P<line>\d+) column \d+', str(error)) |
| 47 if not match: | 48 if not match: |
| 48 return 0 | 49 return 0 |
| 49 return int(match.group('line')) | 50 return int(match.group('line')) |
| OLD | NEW |