diff options
author | Brett Cannon <brett@python.org> | 2014-08-29 14:24:30 -0400 |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2014-08-29 14:24:30 -0400 |
commit | 8f3506b375a193856f7dd857f582f6f3b9c5580c (patch) | |
tree | 421c672fbc23e47f4fdc8c4b8dfb7154a9765dad /checkers/strings.py | |
parent | fea908c8e20aa3eac1bcaad18fecd4c68cfc9b05 (diff) | |
download | pylint-8f3506b375a193856f7dd857f582f6f3b9c5580c.tar.gz |
Change basestring to six.string_types
Diffstat (limited to 'checkers/strings.py')
-rw-r--r-- | checkers/strings.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/checkers/strings.py b/checkers/strings.py index f517c4c..03c557a 100644 --- a/checkers/strings.py +++ b/checkers/strings.py @@ -30,6 +30,9 @@ from pylint.checkers import BaseChecker, BaseTokenChecker from pylint.checkers import utils from pylint.checkers.utils import check_messages +import six + + _PY3K = sys.version_info[:2] >= (3, 0) _PY27 = sys.version_info[:2] == (2, 7) @@ -231,7 +234,7 @@ class StringFormatChecker(BaseChecker): args = node.right if not (isinstance(left, astroid.Const) - and isinstance(left.value, basestring)): + and isinstance(left.value, six.string_types)): return format_string = left.value try: @@ -260,7 +263,7 @@ class StringFormatChecker(BaseChecker): for k, _ in args.items: if isinstance(k, astroid.Const): key = k.value - if isinstance(key, basestring): + if isinstance(key, six.string_types): keys.add(key) else: self.add_message('bad-format-string-key', @@ -365,7 +368,7 @@ class StringMethodsChecker(BaseChecker): return named_fields = set(field[0] for field in fields - if isinstance(field[0], basestring)) + if isinstance(field[0], six.string_types)) if num_args and manual_pos: self.add_message('format-combined-specification', node=node) |