summaryrefslogtreecommitdiff
path: root/doc/swig
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 /doc/swig
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 'doc/swig')
-rwxr-xr-xdoc/swig/test/testArray.py2
-rwxr-xr-xdoc/swig/test/testFarray.py2
-rw-r--r--doc/swig/test/testFortran.py2
-rwxr-xr-xdoc/swig/test/testMatrix.py2
-rwxr-xr-xdoc/swig/test/testTensor.py2
-rwxr-xr-xdoc/swig/test/testVector.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/doc/swig/test/testArray.py b/doc/swig/test/testArray.py
index b25aff85a..433dfb1bd 100755
--- a/doc/swig/test/testArray.py
+++ b/doc/swig/test/testArray.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform
diff --git a/doc/swig/test/testFarray.py b/doc/swig/test/testFarray.py
index 184fd2564..c0699b07d 100755
--- a/doc/swig/test/testFarray.py
+++ b/doc/swig/test/testFarray.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform
diff --git a/doc/swig/test/testFortran.py b/doc/swig/test/testFortran.py
index 56bc03eae..499f6a439 100644
--- a/doc/swig/test/testFortran.py
+++ b/doc/swig/test/testFortran.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform
diff --git a/doc/swig/test/testMatrix.py b/doc/swig/test/testMatrix.py
index 68259de3e..187cd7214 100755
--- a/doc/swig/test/testMatrix.py
+++ b/doc/swig/test/testMatrix.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform
diff --git a/doc/swig/test/testTensor.py b/doc/swig/test/testTensor.py
index 41b037811..cd9cada46 100755
--- a/doc/swig/test/testTensor.py
+++ b/doc/swig/test/testTensor.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform
diff --git a/doc/swig/test/testVector.py b/doc/swig/test/testVector.py
index 2ad00b856..29a77d281 100755
--- a/doc/swig/test/testVector.py
+++ b/doc/swig/test/testVector.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
# System imports
from distutils.util import get_platform