diff options
| author | Claudiu Popa <pcmanticore@gmail.com> | 2014-07-23 13:18:25 +0200 |
|---|---|---|
| committer | Claudiu Popa <pcmanticore@gmail.com> | 2014-07-23 13:18:25 +0200 |
| commit | aad6ec6e17654b1c202d33912dfcc55fb9288441 (patch) | |
| tree | c761b340c9facbc23059c7480b311d42540e2827 /checkers | |
| parent | 1df3bf598b0f5256802cb1d5486be3bffde20632 (diff) | |
| parent | 4bdb95ad8d3d14fd419119c7ae379da3bddcb126 (diff) | |
| download | pylint-aad6ec6e17654b1c202d33912dfcc55fb9288441.tar.gz | |
Merged logilab/pylint into default
Diffstat (limited to 'checkers')
| -rw-r--r-- | checkers/__init__.py | 4 | ||||
| -rw-r--r-- | checkers/strings.py | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/checkers/__init__.py b/checkers/__init__.py index af7965b..693a5ff 100644 --- a/checkers/__init__.py +++ b/checkers/__init__.py @@ -42,7 +42,6 @@ import sys import tokenize import warnings -from astroid.utils import ASTWalker from logilab.common.configuration import OptionsProviderMixIn from pylint.reporters import diff_string @@ -69,7 +68,7 @@ def table_lines_from_stats(stats, old_stats, columns): return lines -class BaseChecker(OptionsProviderMixIn, ASTWalker): +class BaseChecker(OptionsProviderMixIn): """base class for checkers""" # checker name (you may reuse an existing one) name = None @@ -87,7 +86,6 @@ class BaseChecker(OptionsProviderMixIn, ASTWalker): linter is an object implementing ILinter """ - ASTWalker.__init__(self, self) self.name = self.name.lower() OptionsProviderMixIn.__init__(self) self.linter = linter diff --git a/checkers/strings.py b/checkers/strings.py index 4fe16dd..ad63580 100644 --- a/checkers/strings.py +++ b/checkers/strings.py @@ -327,10 +327,10 @@ class StringMethodsChecker(BaseChecker): self.add_message('bad-format-string', node=node) return - manual_fields = {field[0] for field in fields - if isinstance(field[0], int)} - named_fields = {field[0] for field in fields - if isinstance(field[0], str)} + manual_fields = set(field[0] for field in fields + if isinstance(field[0], int)) + named_fields = set(field[0] for field in fields + if isinstance(field[0], str)) if manual_fields and num_args: self.add_message('format-combined-specification', node=node) |