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/testing/decorators.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/testing/decorators.py')
-rw-r--r-- | numpy/testing/decorators.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index eae9d93b0..6d3da95ed 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -13,7 +13,7 @@ function name, setup and teardown functions and so on - see ``nose.tools`` for more information. """ -from __future__ import division +from __future__ import division, absolute_import import warnings import sys @@ -210,7 +210,7 @@ def knownfailureif(fail_condition, msg=None): # Local import to avoid a hard nose dependency and only incur the # import time overhead at actual test-time. import nose - from noseclasses import KnownFailureTest + from .noseclasses import KnownFailureTest def knownfailer(*args, **kwargs): if fail_val(): raise KnownFailureTest(msg) @@ -249,7 +249,7 @@ def deprecated(conditional=True): # Local import to avoid a hard nose dependency and only incur the # import time overhead at actual test-time. import nose - from noseclasses import KnownFailureTest + from .noseclasses import KnownFailureTest def _deprecated_imp(*args, **kwargs): # Poor man's replacement for the with statement |