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

2to3: Apply `imports` fixer.

Author: charris

doc/cdoc/numpyfilter.py

@@ -13,7 +13,11 @@
 import os
 import textwrap
 import optparse
-import cPickle as pickle
+
+if sys.version_info[0] >= 3:
+    import pickle
+else:
+    import cPickle as pickle
 
 CACHE_FILE = 'build/rst-cache.pck'
 
@@ -43,7 +47,7 @@ def filter_comment(text):
     if text.startswith('UFUNC_API'):
         text = text[9:].strip()
 
-    html = render_html(text)    
+    html = render_html(text)
     return html
 
 def process_match(m, cache=None):

doc/numpybook/runcode.py

@@ -18,7 +18,7 @@
 
 import sys
 import optparse
-import cStringIO
+import io
 import re
 import os
 
@@ -27,7 +27,7 @@
 def getoutput(tstr, dic):
     print "\n\nRunning..."
     print tstr,
-    tempstr = cStringIO.StringIO()
+    tempstr = io.StringIO()
     sys.stdout = tempstr
     code = compile(tstr, '<input>', 'exec')
     try:
@@ -82,7 +82,7 @@ def getnewcodestr(substr, dic):
 
 def runpycode(lyxstr, name='MyCode'):
     schobj = re.compile(r"\\layout %s\s+>>> " % name)
-    outstr = cStringIO.StringIO()
+    outstr = io.StringIO()
     num = 0
     indx = []
     for it in schobj.finditer(lyxstr):

doc/sphinxext/numpydoc/comment_eater.py

@@ -4,7 +4,7 @@
 if sys.version_info[0] >= 3:
     from io import StringIO
 else:
-    from cStringIO import StringIO
+    from io import StringIO
 
 import compiler
 import inspect

doc/sphinxext/numpydoc/compiler_unparse.py

@@ -18,7 +18,7 @@
 if sys.version_info[0] >= 3:
     from io import StringIO
 else:
-    from cStringIO import StringIO
+    from io import StringIO
 
 def unparse(ast, single_line_functions=False):
     s = StringIO()

doc/sphinxext/numpydoc/docscrape.py

@@ -14,7 +14,7 @@
 if sys.version_info[0] >= 3:
     from io import StringIO
 else:
-    from cStringIO import StringIO
+    from io import StringIO
 
 class Reader(object):
     """A line-based string reader.

doc/sphinxext/numpydoc/plot_directive.py

@@ -82,7 +82,7 @@
 if sys.version_info[0] >= 3:
     from io import StringIO
 else:
-    from cStringIO import StringIO
+    from io import StringIO
 
 import warnings
 warnings.warn("A plot_directive module is also available under "

numpy/__init__.py

@@ -106,6 +106,8 @@
 """
 from __future__ import division, absolute_import
 
+import sys
+
 # We first need to detect if we're being called as part of the numpy setup
 # procedure itself in a reliable manner.
 try:
@@ -160,8 +162,11 @@ def pkgload(*packages, **options):
 
     # Make these accessible from numpy name-space
     #  but not imported in from numpy import *
-    from __builtin__ import bool, int, long, float, complex, \
-         object, unicode, str
+    if sys.version_info[0] >= 3:
+        from builtins import bool, int, long, float, complex, object, unicode, str
+    else:
+        from __builtin__ import bool, int, long, float, complex, object, unicode, str
+
     from .core import round, abs, max, min
 
     __all__.extend(['__version__', 'pkgload', 'PackageLoader',

numpy/core/__init__.py

@@ -62,10 +62,10 @@ def _ufunc_reduce(func):
 
 
 import sys
-if sys.version_info[0] < 3:
-    import copy_reg as copyreg
-else:
+if sys.version_info[0] >= 3:
     import copyreg
+else:
+    import copy_reg as copyreg
 
 copyreg.pickle(ufunc, _ufunc_reduce, _ufunc_reconstruct)
 # Unclutter namespace (must keep _ufunc_reconstruct for unpickling)

numpy/core/numeric.py

@@ -1,5 +1,22 @@
 from __future__ import division, absolute_import
 
+import sys
+import warnings
+from . import multiarray
+from . import umath
+from .umath import *
+from . import numerictypes
+from .numerictypes import *
+import collections
+
+if sys.version_info[0] >= 3:
+    import pickle
+else:
+    import cPickle as pickle
+
+loads = pickle.loads
+
+
 __all__ = ['newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc',
            'arange', 'array', 'zeros', 'count_nonzero',
            'empty', 'broadcast', 'dtype', 'fromstring', 'fromfile',
@@ -24,19 +41,10 @@
            'CLIP', 'RAISE', 'WRAP', 'MAXDIMS', 'BUFSIZE', 'ALLOW_THREADS',
            'ComplexWarning']
 
-import sys
-import warnings
-from . import multiarray
-from . import umath
-from .umath import *
-from . import numerictypes
-from .numerictypes import *
-import collections
-
-
 if sys.version_info[0] < 3:
     __all__.extend(['getbuffer', 'newbuffer'])
 
+
 class ComplexWarning(RuntimeWarning):
     """
     The warning raised when casting a complex dtype to a real dtype.
@@ -1861,9 +1869,6 @@ def base_repr(number, base=2, padding=0):
         res.append('-')
     return ''.join(reversed(res or '0'))
 
-from cPickle import load, loads
-_cload = load
-_file = open
 
 def load(file):
     """
@@ -1880,8 +1885,8 @@ def load(file):
 
     """
     if isinstance(file, type("")):
-        file = _file(file,"rb")
-    return _cload(file)
+        file = open(file, "rb")
+    return pickle.load(file)
 
 # These are all essentially abbreviations
 # These might wind up in a special abbreviations module

numpy/core/numerictypes.py

@@ -98,7 +98,11 @@
 
 # we don't export these for import *, but we do want them accessible
 # as numerictypes.bool, etc.
-from __builtin__ import bool, int, long, float, complex, object, unicode, str
+if sys.version_info[0] >= 3:
+    from builtins import bool, int, long, float, complex, object, unicode, str
+else:
+    from __builtin__ import bool, int, long, float, complex, object, unicode, str
+
 from numpy.compat import bytes
 
 if sys.version_info[0] >= 3: