| 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 '%s: value must be between 1 and 5' | 436 '%s: value must be between 1 and 5' |
| 437 % min_confidence) | 437 % min_confidence) |
| 438 | 438 |
| 439 if filter_value: | 439 if filter_value: |
| 440 filter_rules = self._parse_filter_flag(filter_value) | 440 filter_rules = self._parse_filter_flag(filter_value) |
| 441 else: | 441 else: |
| 442 filter_rules = [] | 442 filter_rules = [] |
| 443 | 443 |
| 444 try: | 444 try: |
| 445 validate_filter_rules(filter_rules, self._all_categories) | 445 validate_filter_rules(filter_rules, self._all_categories) |
| 446 except ValueError, err: | 446 except ValueError as err: |
| 447 self._parse_error(err) | 447 self._parse_error(err) |
| 448 | 448 |
| 449 options = CommandOptionValues(filter_rules=filter_rules, | 449 options = CommandOptionValues(filter_rules=filter_rules, |
| 450 git_commit=git_commit, | 450 git_commit=git_commit, |
| 451 diff_files=diff_files, | 451 diff_files=diff_files, |
| 452 is_verbose=is_verbose, | 452 is_verbose=is_verbose, |
| 453 min_confidence=min_confidence, | 453 min_confidence=min_confidence, |
| 454 output_format=output_format) | 454 output_format=output_format) |
| 455 | 455 |
| 456 return (paths, options) | 456 return (paths, options) |
| OLD | NEW |