summaryrefslogtreecommitdiff
path: root/pylint/checkers/variables.py
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2015-11-25 15:12:59 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2015-11-25 15:12:59 +0200
commitb29b39b6fce8b5bff642fc2376c25d9896dbc482 (patch)
tree3bb5d0ab234af0d2bb7b11a81b3982d56d008520 /pylint/checkers/variables.py
parentd796f317c69bc5d747769ef9cb74cc5896b895f8 (diff)
downloadpylint-b29b39b6fce8b5bff642fc2376c25d9896dbc482.tar.gz
Fix new import related errors in pylint's codebase.
Diffstat (limited to 'pylint/checkers/variables.py')
-rw-r--r--pylint/checkers/variables.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
index cde66eb..7629a7b 100644
--- a/pylint/checkers/variables.py
+++ b/pylint/checkers/variables.py
@@ -20,9 +20,10 @@ import sys
import re
from copy import copy
+import six
+
import astroid
from astroid import modutils
-
from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE, HIGH
from pylint.utils import get_global_option
from pylint.checkers import BaseChecker
@@ -33,7 +34,6 @@ from pylint.checkers.utils import (
get_all_elements, has_known_bases, node_ignores_exception,
is_inside_abstract_class, is_comprehension, is_iterable,
safe_infer)
-import six
SPECIAL_OBJ = re.compile("^_{2}[a-z]+_{2}$")
FUTURE = '__future__'