summaryrefslogtreecommitdiff
path: root/numpy/oldnumeric/misc.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-03-27 21:49:08 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-03-28 08:43:26 -0600
commitd4b88c1dbd6898fb6fcebc97f36b421999340f71 (patch)
tree61cc0282cf2509afe364c91e97b59dfb2ebcafd3 /numpy/oldnumeric/misc.py
parent40742184df68fc01f3392c9865f35d5402e74b01 (diff)
downloadnumpy-d4b88c1dbd6898fb6fcebc97f36b421999340f71.tar.gz
2to3: Use absolute imports.
The new import `absolute_import` is added the `from __future__ import` statement and The 2to3 `import` fixer is run to make the imports compatible. There are several things that need to be dealt with to make this work. 1) Files meant to be run as scripts run in a different environment than files imported as part of a package, and so changes to those files need to be skipped. The affected script files are: * all setup.py files * numpy/core/code_generators/generate_umath.py * numpy/core/code_generators/generate_numpy_api.py * numpy/core/code_generators/generate_ufunc_api.py 2) Some imported modules are not available as they are created during the build process and consequently 2to3 is unable to handle them correctly. Files that import those modules need a bit of extra work. The affected files are: * core/__init__.py, * core/numeric.py, * core/_internal.py, * core/arrayprint.py, * core/fromnumeric.py, * numpy/__init__.py, * lib/npyio.py, * lib/function_base.py, * fft/fftpack.py, * random/__init__.py Closes #3172
Diffstat (limited to 'numpy/oldnumeric/misc.py')
-rw-r--r--numpy/oldnumeric/misc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py
index 3871d8251..8f1e1ae96 100644
--- a/numpy/oldnumeric/misc.py
+++ b/numpy/oldnumeric/misc.py
@@ -1,7 +1,7 @@
"""Functions that already have the correct syntax or miscellaneous functions
"""
-from __future__ import division
+from __future__ import division, absolute_import
__all__ = ['sort', 'copy_reg', 'clip', 'rank',
'sign', 'shape', 'types', 'allclose', 'size',
@@ -35,4 +35,4 @@ from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\
correlate as cross_correlate, \
place as insert
-from array_printer import array2string
+from .array_printer import array2string