summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Anclin <emile.anclin@logilab.fr>2010-03-22 10:33:23 +0100
committerEmile Anclin <emile.anclin@logilab.fr>2010-03-22 10:33:23 +0100
commitd6b41bf89b74a4217fa43da32da885a0d76cb4c3 (patch)
tree7f271685368d23f8e97ea46b3efa94bd65230941
parentc50f000425ea7168149b690b08e4f9a2f7cc47e5 (diff)
downloadpylint-git-d6b41bf89b74a4217fa43da32da885a0d76cb4c3.tar.gz
modify astng imports after astng 'rebuild' refactoring
-rwxr-xr-xcheckers/base.py2
-rw-r--r--checkers/classes.py2
-rw-r--r--checkers/exceptions.py2
-rw-r--r--checkers/imports.py2
-rw-r--r--checkers/typecheck.py3
-rw-r--r--checkers/variables.py3
6 files changed, 6 insertions, 8 deletions
diff --git a/checkers/base.py b/checkers/base.py
index ada5aae33..ea2cfc894 100755
--- a/checkers/base.py
+++ b/checkers/base.py
@@ -20,7 +20,7 @@
from logilab import astng
from logilab.common.compat import any
from logilab.common.ureports import Table
-from logilab.astng.infutils import are_exclusive
+from logilab.astng import are_exclusive
from pylint.interfaces import IASTNGChecker
from pylint.reporters import diff_string
diff --git a/checkers/classes.py b/checkers/classes.py
index 0609d17cf..6494e2751 100644
--- a/checkers/classes.py
+++ b/checkers/classes.py
@@ -18,7 +18,7 @@
from __future__ import generators
from logilab import astng
-from logilab.astng.infutils import YES, Instance, are_exclusive
+from logilab.astng import YES, Instance, are_exclusive
from pylint.interfaces import IASTNGChecker
from pylint.checkers import BaseChecker
diff --git a/checkers/exceptions.py b/checkers/exceptions.py
index f127af6c1..6d8aac0bf 100644
--- a/checkers/exceptions.py
+++ b/checkers/exceptions.py
@@ -18,7 +18,7 @@ import sys
from logilab.common.compat import enumerate
from logilab import astng
-from logilab.astng.infutils import YES, Instance, unpack_infer
+from logilab.astng import YES, Instance, unpack_infer
from pylint.checkers import BaseChecker
from pylint.checkers.utils import is_empty, is_raising
diff --git a/checkers/imports.py b/checkers/imports.py
index 37df06c95..98c45dcb1 100644
--- a/checkers/imports.py
+++ b/checkers/imports.py
@@ -21,7 +21,7 @@ from logilab.common.ureports import VerbatimText, Paragraph
from logilab.common.compat import sorted, enumerate
from logilab import astng
-from logilab.astng.infutils import are_exclusive
+from logilab.astng import are_exclusive
from pylint.interfaces import IASTNGChecker
from pylint.checkers import BaseChecker, EmptyReport
diff --git a/checkers/typecheck.py b/checkers/typecheck.py
index 7913bb8b3..db73c8fcc 100644
--- a/checkers/typecheck.py
+++ b/checkers/typecheck.py
@@ -20,8 +20,7 @@ from logilab.common.compat import set
from logilab import astng
-from logilab.astng import InferenceError, NotFoundError
-from logilab.astng.infutils import YES, Instance
+from logilab.astng import InferenceError, NotFoundError, YES, Instance
from pylint.interfaces import IASTNGChecker
from pylint.checkers import BaseChecker
diff --git a/checkers/variables.py b/checkers/variables.py
index e7b7fd56e..0a57f709d 100644
--- a/checkers/variables.py
+++ b/checkers/variables.py
@@ -20,8 +20,7 @@ from copy import copy
from logilab.common.compat import enumerate
from logilab import astng
-from logilab.astng.lookup import builtin_lookup
-from logilab.astng.infutils import are_exclusive
+from logilab.astng import are_exclusive, builtin_lookup
from pylint.interfaces import IASTNGChecker
from pylint.checkers import BaseChecker