diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-27 21:49:08 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-28 08:43:26 -0600 |
| commit | d4b88c1dbd6898fb6fcebc97f36b421999340f71 (patch) | |
| tree | 61cc0282cf2509afe364c91e97b59dfb2ebcafd3 /numpy/compat | |
| parent | 40742184df68fc01f3392c9865f35d5402e74b01 (diff) | |
| download | numpy-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/compat')
| -rw-r--r-- | numpy/compat/__init__.py | 10 | ||||
| -rw-r--r-- | numpy/compat/_inspect.py | 2 | ||||
| -rw-r--r-- | numpy/compat/py3k.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/numpy/compat/__init__.py b/numpy/compat/__init__.py index 930be5a90..bb40fdbe9 100644 --- a/numpy/compat/__init__.py +++ b/numpy/compat/__init__.py @@ -8,12 +8,12 @@ extensions, which may be included for the following reasons: * we may only need a small subset of the copied library/module """ -from __future__ import division +from __future__ import division, absolute_import -import _inspect -import py3k -from _inspect import getargspec, formatargspec -from py3k import * +from . import _inspect +from . import py3k +from ._inspect import getargspec, formatargspec +from .py3k import * __all__ = [] __all__.extend(_inspect.__all__) diff --git a/numpy/compat/_inspect.py b/numpy/compat/_inspect.py index cb9717ced..902d609a9 100644 --- a/numpy/compat/_inspect.py +++ b/numpy/compat/_inspect.py @@ -5,7 +5,7 @@ significanly contributes to numpy import times. Importing this copy has almost no overhead. """ -from __future__ import division +from __future__ import division, absolute_import import types diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py index 594acc1e0..7d853d84b 100644 --- a/numpy/compat/py3k.py +++ b/numpy/compat/py3k.py @@ -2,7 +2,7 @@ Python 3 compatibility tools. """ -from __future__ import division +from __future__ import division, absolute_import __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar', 'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested', |