diff options
-rw-r--r-- | astroid/node_classes.py | 2 | ||||
-rw-r--r-- | astroid/nodes.py | 1 | ||||
-rw-r--r-- | astroid/scoped_nodes.py | 2 | ||||
-rw-r--r-- | astroid/tests/unittest_brain.py | 2 | ||||
-rw-r--r-- | astroid/tests/unittest_builder.py | 1 | ||||
-rw-r--r-- | astroid/tests/unittest_inspector.py | 2 | ||||
-rw-r--r-- | astroid/tests/unittest_lookup.py | 1 | ||||
-rw-r--r-- | astroid/tests/unittest_nodes.py | 4 | ||||
-rw-r--r-- | astroid/tests/unittest_regrtest.py | 4 | ||||
-rw-r--r-- | pylintrc | 2 |
10 files changed, 8 insertions, 13 deletions
diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 71e512f..f6061b1 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -24,7 +24,7 @@ import six from logilab.common.decorators import cachedproperty from astroid.exceptions import NoDefault -from astroid.bases import (NodeNG, Statement, Instance, InferenceContext, +from astroid.bases import (NodeNG, Statement, Instance, _infer_stmts, YES, BUILTINS) from astroid.mixins import (BlockRangeMixIn, AssignTypeMixin, ParentAssignTypeMixin, FromImportMixIn) diff --git a/astroid/nodes.py b/astroid/nodes.py index 263ab47..67c2f8e 100644 --- a/astroid/nodes.py +++ b/astroid/nodes.py @@ -34,6 +34,7 @@ on From and Import : """ +# pylint: disable=unused-import __docformat__ = "restructuredtext en" diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index 6bca463..88e4fe1 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -39,7 +39,7 @@ from astroid.exceptions import NotFoundError, \ AstroidBuildingException, InferenceError, ResolveError from astroid.node_classes import Const, DelName, DelAttr, \ Dict, From, List, Pass, Raise, Return, Tuple, Yield, YieldFrom, \ - LookupMixIn, const_factory as cf, unpack_infer, Name, CallFunc + LookupMixIn, const_factory as cf, unpack_infer, CallFunc from astroid.bases import NodeNG, InferenceContext, Instance,\ YES, Generator, UnboundMethod, BoundMethod, _infer_stmts, \ BUILTINS diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py index 81cd359..ddc449a 100644 --- a/astroid/tests/unittest_brain.py +++ b/astroid/tests/unittest_brain.py @@ -27,7 +27,7 @@ import astroid try: - import nose + import nose # pylint: disable=unused-import HAS_NOSE = True except ImportError: HAS_NOSE = False diff --git a/astroid/tests/unittest_builder.py b/astroid/tests/unittest_builder.py index f1a439a..8d63152 100644 --- a/astroid/tests/unittest_builder.py +++ b/astroid/tests/unittest_builder.py @@ -22,7 +22,6 @@ import sys import unittest from astroid import builder, nodes, InferenceError, NotFoundError -from astroid.nodes import Module from astroid.bases import YES, BUILTINS from astroid.manager import AstroidManager from astroid import test_utils diff --git a/astroid/tests/unittest_inspector.py b/astroid/tests/unittest_inspector.py index fa48a5e..51e7cdf 100644 --- a/astroid/tests/unittest_inspector.py +++ b/astroid/tests/unittest_inspector.py @@ -17,8 +17,6 @@ for the visitors.diadefs module """ -import sys -from os.path import join, abspath, dirname import unittest diff --git a/astroid/tests/unittest_lookup.py b/astroid/tests/unittest_lookup.py index 1074e21..cec8de3 100644 --- a/astroid/tests/unittest_lookup.py +++ b/astroid/tests/unittest_lookup.py @@ -18,7 +18,6 @@ """tests for the astroid variable lookup capabilities """ import sys -from os.path import join, abspath, dirname from functools import partial import unittest diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py index 264d628..725f996 100644 --- a/astroid/tests/unittest_nodes.py +++ b/astroid/tests/unittest_nodes.py @@ -22,8 +22,8 @@ import sys import unittest from astroid.node_classes import unpack_infer -from astroid.bases import BUILTINS, YES, InferenceContext -from astroid.exceptions import AstroidBuildingException, NotFoundError +from astroid.bases import BUILTINS, InferenceContext +from astroid.exceptions import NotFoundError from astroid import builder, nodes from astroid import test_utils from astroid.tests import resources diff --git a/astroid/tests/unittest_regrtest.py b/astroid/tests/unittest_regrtest.py index 28632e7..4227dfa 100644 --- a/astroid/tests/unittest_regrtest.py +++ b/astroid/tests/unittest_regrtest.py @@ -15,13 +15,11 @@ # # You should have received a copy of the GNU Lesser General Public License along # with astroid. If not, see <http://www.gnu.org/licenses/>. -from os.path import join, abspath, dirname import sys import unittest import textwrap -from astroid import ResolveError, MANAGER, Instance, nodes, YES, InferenceError -from astroid.bases import BUILTINS +from astroid import MANAGER, Instance, nodes from astroid.builder import AstroidBuilder from astroid.raw_building import build_module from astroid.manager import AstroidManager @@ -92,7 +92,7 @@ confidence= # no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=all
-enable=trailing-whitespace, bad-whitespace
+enable=trailing-whitespace, bad-whitespace, unused-import
[BASIC]
|