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/f2py/cb_rules.py | |
| 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/f2py/cb_rules.py')
| -rw-r--r-- | numpy/f2py/cb_rules.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py index 05404add2..bc565a904 100644 --- a/numpy/f2py/cb_rules.py +++ b/numpy/f2py/cb_rules.py @@ -13,11 +13,11 @@ $Date: 2005/07/20 11:27:58 $ Pearu Peterson """ -from __future__ import division +from __future__ import division, absolute_import __version__ = "$Revision: 1.53 $"[10:-1] -import __version__ +from . import __version__ f2py_version = __version__.version @@ -28,8 +28,8 @@ errmess=sys.stderr.write outmess=sys.stdout.write show=pprint.pprint -from auxfuncs import * -import cfuncs +from .auxfuncs import * +from . import cfuncs ################## Rules for callback function ############## @@ -416,7 +416,7 @@ def buildcallbacks(m): def buildcallback(rout,um): global cb_map - import capi_maps + from . import capi_maps outmess('\tConstructing call-back function "cb_%s_in_%s"\n'%(rout['name'],um)) args,depargs=getargs(rout) |