8 files changed, 10 insertions, 17 deletions
diff --git a/numpy/lib/convdtype.py b/numpy/lib/convdtype.py
index ffef92e1c..ebc1ba512 100644
--- a/numpy/lib/convdtype.py
+++ b/numpy/lib/convdtype.py
@@ -1,6 +1,5 @@
 from tokenize import  generate_tokens
 import token
-from StringIO import StringIO
 import sys
 def insert(s1, s2, posn):
     """insert s1 into s2 at positions posn
@@ -17,6 +16,7 @@ def insert(s1, s2, posn):
 
 def insert_dtype(readline, output=None):
     """
+    >>> from StringIO import StringIO
     >>> src = "zeros((2,3), dtype=float); zeros((2,3));"
     >>> insert_dtype(StringIO(src).readline)
     zeros((2,3), dtype=float); zeros((2,3), dtype=int);
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 1b79afc25..d7ba85add 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -639,7 +639,7 @@ def trim_zeros(filt, trim='fb'):
 
 import sys
 if sys.hexversion < 0x2040000:
-   from sets import Set as set
+    from sets import Set as set
 
 def unique(x):
     """Return sorted unique items from an array or sequence.
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index e64d5dcd4..8ac065c47 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -8,7 +8,6 @@ __all__ = ['unravel_index',
            'ndenumerate','ndindex']
 
 import sys
-import types
 import numpy.core.numeric as _nx
 from numpy.core.numeric import asarray, ScalarType, array
 
@@ -319,8 +318,6 @@ class r_class(concatenator):
 
 r_ = r_class()
 
-import warnings
-
 class c_class(concatenator):
     """Translates slice objects to concatenation along the second axis.
 
diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py
index 9aea4ef12..7026aeb67 100644
--- a/numpy/lib/polynomial.py
+++ b/numpy/lib/polynomial.py
@@ -650,3 +650,5 @@ class poly1d(object):
 # Stuff to do on module import
 
 warnings.simplefilter('always',RankWarning)
+
+    
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
index 0bd3c6ceb..ca228ceef 100644
--- a/numpy/lib/setup.py
+++ b/numpy/lib/setup.py
@@ -1,15 +1,9 @@
-import imp
-import os
 from os.path import join
-from glob import glob
-from distutils.dep_util import newer,newer_group
 
 def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration,dot_join
-    from numpy.distutils.system_info import get_info
+    from numpy.distutils.misc_util import Configuration
 
     config = Configuration('lib',parent_package,top_path)
-    local_dir = config.local_path
 
     config.add_include_dirs(join('..','core','include'))
 
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 250525f76..cb15a2760 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -568,7 +568,7 @@ def kron(a,b):
             nd = nda
     result = outer(a,b).reshape(as_+bs)
     axis = nd-1
-    for k in xrange(nd):
+    for _ in xrange(nd):
         result = concatenate(result, axis=axis)
     if wrapper is not None:
         result = wrapper(result)
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
index fd2ff586a..7904eae30 100644
--- a/numpy/lib/twodim_base.py
+++ b/numpy/lib/twodim_base.py
@@ -5,7 +5,7 @@
 __all__ = ['diag','diagflat','eye','fliplr','flipud','rot90','tri','triu',
            'tril','vander','histogram2d']
 
-from numpy.core.numeric import asanyarray, int_, equal, subtract, arange, \
+from numpy.core.numeric import asanyarray, equal, subtract, arange, \
      zeros, arange, greater_equal, multiply, ones, asarray
 
 def fliplr(m):
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
index e50679eaa..d16dd8a78 100644
--- a/numpy/lib/utils.py
+++ b/numpy/lib/utils.py
@@ -1,8 +1,8 @@
-import sys, os
+import sys
 import inspect
 import types
-from numpy.core.numerictypes import obj2sctype, integer, generic
-from numpy.core.multiarray import dtype as _dtype, _flagdict, flagsobj
+from numpy.core.numerictypes import obj2sctype, generic
+from numpy.core.multiarray import dtype as _dtype
 from numpy.core import product, ndarray
 
 __all__ = ['issubclass_', 'get_numpy_include', 'issubsctype',