Merge pull request #3191 from charris/2to3-apply-imports-fixer

2to3: Apply `imports` fixer.

2 files changed, 19 insertions, 19 deletions

diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py
index 46c3c727f..b63226571 100644
--- a/numpy/oldnumeric/compat.py
+++ b/numpy/oldnumeric/compat.py
@@ -3,6 +3,17 @@
 """
 from __future__ import division, absolute_import
 
+import sys
+import copy
+import pickle
+from pickle import dump, dumps
+
+import numpy.core.multiarray as multiarray
+import numpy.core.umath as um
+from numpy.core.numeric import array
+from . import functions
+
+
 __all__ = ['NewAxis',
            'UFuncType', 'UfuncType', 'ArrayType', 'arraytype',
            'LittleEndian', 'arrayrange', 'matrixmultiply',
@@ -13,13 +24,6 @@ __all__ = ['NewAxis',
            'Unpickler', 'Pickler'
           ]
 
-import numpy.core.multiarray as multiarray
-import numpy.core.umath as um
-from numpy.core.numeric import array
-from . import functions
-import sys
-
-from cPickle import dump, dumps
 
 mu = multiarray
 
@@ -47,8 +51,7 @@ def DumpArray(m, fp):
     m.dump(fp)
 
 def LoadArray(fp):
-    import cPickle
-    return cPickle.load(fp)
+    return pickle.load(fp)
 
 def array_constructor(shape, typecode, thestr, Endian=LittleEndian):
     if typecode == "O":
@@ -70,8 +73,7 @@ def pickle_array(a):
                 (a.shape, a.dtype.char, a.tostring(), LittleEndian))
 
 def loads(astr):
-    import cPickle
-    arr = cPickle.loads(astr.replace('Numeric', 'numpy.oldnumeric'))
+    arr = pickle.loads(astr.replace('Numeric', 'numpy.oldnumeric'))
     return arr
 
 def load(fp):
@@ -97,7 +99,6 @@ def _LoadArray(fp):
     else:
         return m
 
-import pickle, copy
 if sys.version_info[0] >= 3:
     class Unpickler(pickle.Unpickler):
         # XXX: should we implement this? It's not completely straightforward
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index 8f1e1ae96..5ef1f0ac9 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -14,18 +14,17 @@ __all__ = ['sort', 'copy_reg', 'clip', 'rank',
            'dot', 'outerproduct', 'innerproduct', 'insert']
 
 import types
-import StringIO
 import pickle
 import math
 import copy
-import copy_reg
-
 import sys
+
 if sys.version_info[0] >= 3:
-    import copyreg
-    import io
-    StringIO = io.BytesIO
-    copy_reg = copyreg
+    import copyreg as copy_reg
+    from io import BytesIO as StringIO
+else:
+    import copy_reg
+    from StringIO import StringIO
 
 from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\
      choose, swapaxes, array_str, array_repr, e, pi, put, \