From 91dfa1ca00a40fd6063bd4736f3e1de5843adfa6 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Aug 2014 14:24:30 -0400 Subject: Change basestring to six.string_types --HG-- branch : python_6 --- checkers/strings.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'checkers/strings.py') diff --git a/checkers/strings.py b/checkers/strings.py index f517c4c44..03c557aaa 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) -- cgit v1.2.1