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/tests | |
| 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/tests')
| -rw-r--r-- | numpy/f2py/tests/test_array_from_pyobj.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_assumed_shape.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_callback.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_kind.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_mixed.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_character.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_complex.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_integer.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_logical.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_return_real.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/test_size.py | 2 | ||||
| -rw-r--r-- | numpy/f2py/tests/util.py | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py index ff8c16cd1..586833e68 100644 --- a/numpy/f2py/tests/test_array_from_pyobj.py +++ b/numpy/f2py/tests/test_array_from_pyobj.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import unittest import os diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py index 728c034ec..19a557530 100644 --- a/numpy/f2py/tests/test_assumed_shape.py +++ b/numpy/f2py/tests/test_assumed_shape.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os import math diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py index f903fbcb4..51b1bb1b4 100644 --- a/numpy/f2py/tests/test_callback.py +++ b/numpy/f2py/tests/test_callback.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py index 56a747096..d24099b05 100644 --- a/numpy/f2py/tests/test_kind.py +++ b/numpy/f2py/tests/test_kind.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os import math diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py index dc29d2b5d..d62098ab4 100644 --- a/numpy/f2py/tests/test_mixed.py +++ b/numpy/f2py/tests/test_mixed.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os import math diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py index fd8355ac3..5a68bec72 100644 --- a/numpy/f2py/tests/test_return_character.py +++ b/numpy/f2py/tests/test_return_character.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py index 4cdc03993..00ba1cfe6 100644 --- a/numpy/f2py/tests/test_return_complex.py +++ b/numpy/f2py/tests/test_return_complex.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py index a1af6b932..6c55cc1b9 100644 --- a/numpy/f2py/tests/test_return_integer.py +++ b/numpy/f2py/tests/test_return_integer.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py index 1c8dce532..af35c50d1 100644 --- a/numpy/f2py/tests/test_return_logical.py +++ b/numpy/f2py/tests/test_return_logical.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py index 943a4972d..0ea4373fb 100644 --- a/numpy/f2py/tests/test_return_real.py +++ b/numpy/f2py/tests/test_return_real.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py index 72443b4f6..1a41ce972 100644 --- a/numpy/f2py/tests/test_size.py +++ b/numpy/f2py/tests/test_size.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os import math diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py index 215df9553..0da4bc310 100644 --- a/numpy/f2py/tests/util.py +++ b/numpy/f2py/tests/util.py @@ -5,7 +5,7 @@ Utility functions for - detecting if compilers are present """ -from __future__ import division +from __future__ import division, absolute_import import os import sys |
