import cleanups

9 files changed, 15 insertions, 18 deletions

diff --git a/builder.py b/builder.py
index 38a7bba..1c76434 100644
--- a/builder.py
+++ b/builder.py
@@ -23,8 +23,8 @@ at the same time.
 
 __docformat__ = "restructuredtext en"
 
-import sys, re
-from os.path import splitext, basename, dirname, exists, abspath
+import sys
+from os.path import splitext, basename, exists, abspath
 
 from logilab.common.modutils import modpath_from_file
 
diff --git a/inference.py b/inference.py
index ac56bed..3b15834 100644
--- a/inference.py
+++ b/inference.py
@@ -21,14 +21,13 @@
 __doctype__ = "restructuredtext en"
 
 from itertools import chain
-import sys
 
 from logilab.astng import nodes
 
 from logilab.astng.manager import ASTNGManager
-from logilab.astng.exceptions import (ASTNGBuildingException, ASTNGError,
+from logilab.astng.exceptions import (ASTNGError,
     InferenceError, NoDefault, NotFoundError, UnresolvableName)
-from logilab.astng.bases import YES, Instance, InferenceContext, Generator, \
+from logilab.astng.bases import YES, Instance, InferenceContext, \
      _infer_stmts, copy_context, path_wrapper, raise_if_nothing_infered
 from logilab.astng.protocols import _arguments_infer_argname
 
diff --git a/manager.py b/manager.py
index 5ad2c04..2ca24f6 100644
--- a/manager.py
+++ b/manager.py
@@ -22,9 +22,8 @@ from various source and using a cache of built modules)
 
 __docformat__ = "restructuredtext en"
 
-import sys
 import os
-from os.path import dirname, basename, abspath, join, isdir, exists
+from os.path import dirname, join, isdir, exists
 
 from logilab.common.modutils import NoSourceFile, is_python_source, \
      file_from_modpath, load_module_from_name, modpath_from_file, \
diff --git a/mixins.py b/mixins.py
index b5af35c..97cc606 100644
--- a/mixins.py
+++ b/mixins.py
@@ -41,6 +41,7 @@ class BlockRangeMixIn(object):
             return lineno, orelse[0].fromlineno - 1
         return lineno, last or self.tolineno
 
+
 class FilterStmtsMixin(object):
     """Mixin for statement filtering and assignment type"""
 
@@ -78,7 +79,6 @@ class ParentAssignTypeMixin(AssignTypeMixin):
         return self.parent.ass_type()
 
 
-
 class FromImportMixIn(FilterStmtsMixin):
     """MixIn for From and Import Nodes"""
 
diff --git a/protocols.py b/protocols.py
index 25d702c..4498460 100644
--- a/protocols.py
+++ b/protocols.py
@@ -24,7 +24,7 @@ __doctype__ = "restructuredtext en"
 from logilab.astng.exceptions import InferenceError, NoDefault
 from logilab.astng.node_classes import unpack_infer
 from logilab.astng.bases import copy_context, \
-     raise_if_nothing_infered, yes_if_nothing_infered, Instance, Generator, YES
+     raise_if_nothing_infered, yes_if_nothing_infered, Instance, YES
 from logilab.astng.nodes import const_factory
 from logilab.astng import nodes
 
diff --git a/raw_building.py b/raw_building.py
index 6b3f108..96eafea 100644
--- a/raw_building.py
+++ b/raw_building.py
@@ -28,7 +28,7 @@ from inspect import (getargspec, isdatadescriptor, isfunction, ismethod,
 
 from logilab.astng.node_classes import CONST_CLS
 from logilab.astng.nodes import (Module, Class, Const, const_factory, From,
-    Function, EmptyNode, Name, Arguments, Dict, List, Set, Tuple)
+    Function, EmptyNode, Name, Arguments)
 from logilab.astng.bases import BUILTINS, Generator
 from logilab.astng.manager import ASTNGManager
 MANAGER = ASTNGManager()
diff --git a/rebuilder.py b/rebuilder.py
index 01bb204..0f5c764 100644
--- a/rebuilder.py
+++ b/rebuilder.py
@@ -32,7 +32,6 @@ from _ast import (Expr as Discard, Str,
     Eq, Gt, GtE, In, Is, IsNot, Lt, LtE, NotEq, NotIn,
     )
 
-from logilab.astng.exceptions import ASTNGBuildingException
 from logilab.astng import nodes as new
 
 
diff --git a/scoped_nodes.py b/scoped_nodes.py
index 2b8281d..8ad8116 100644
--- a/scoped_nodes.py
+++ b/scoped_nodes.py
@@ -29,11 +29,11 @@ from itertools import chain
 from logilab.common.compat import builtins
 from logilab.common.decorators import cached
 
-from logilab.astng.exceptions import NotFoundError, NoDefault, \
+from logilab.astng.exceptions import NotFoundError, \
      ASTNGBuildingException, InferenceError
 from logilab.astng.node_classes import Const, DelName, DelAttr, \
-     Dict, From, List, Name, Pass, Raise, Return, Tuple, Yield, \
-     are_exclusive, LookupMixIn, const_factory as cf, unpack_infer
+     Dict, From, List, Pass, Raise, Return, Tuple, Yield, \
+     LookupMixIn, const_factory as cf, unpack_infer
 from logilab.astng.bases import NodeNG, InferenceContext, Instance,\
      YES, Generator, UnboundMethod, BoundMethod, _infer_stmts, copy_context, \
      BUILTINS
diff --git a/test/unittest_scoped_nodes.py b/test/unittest_scoped_nodes.py
index a1137f9..7b1222b 100644
--- a/test/unittest_scoped_nodes.py
+++ b/test/unittest_scoped_nodes.py
@@ -25,7 +25,7 @@ from os.path import join, abspath, dirname
 from logilab.common.testlib import TestCase, unittest_main
 
 from logilab.astng import builder, nodes, scoped_nodes, \
-     InferenceError, NotFoundError
+     InferenceError, NotFoundError, NoDefault
 from logilab.astng.bases import BUILTINS, Instance, BoundMethod, UnboundMethod
 
 abuilder = builder.ASTNGBuilder()
@@ -182,9 +182,9 @@ class FunctionNodeTC(TestCase):
     def test_default_value(self):
         func = MODULE2['make_class']
         self.assertIsInstance(func.args.default_value('base'), nodes.Getattr)
-        self.assertRaises(scoped_nodes.NoDefault, func.args.default_value, 'args')
-        self.assertRaises(scoped_nodes.NoDefault, func.args.default_value, 'kwargs')
-        self.assertRaises(scoped_nodes.NoDefault, func.args.default_value, 'any')
+        self.assertRaises(NoDefault, func.args.default_value, 'args')
+        self.assertRaises(NoDefault, func.args.default_value, 'kwargs')
+        self.assertRaises(NoDefault, func.args.default_value, 'any')
         #self.assertIsInstance(func.mularg_class('args'), nodes.Tuple)
         #self.assertIsInstance(func.mularg_class('kwargs'), nodes.Dict)
         #self.assertIsNone(func.mularg_class('base'))