summaryrefslogtreecommitdiff
path: root/doc/sphinxext
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/sphinxext
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/sphinxext')
-rw-r--r--doc/sphinxext/numpydoc/comment_eater.py2
-rw-r--r--doc/sphinxext/numpydoc/compiler_unparse.py2
-rw-r--r--doc/sphinxext/numpydoc/docscrape.py2
-rw-r--r--doc/sphinxext/numpydoc/docscrape_sphinx.py2
-rw-r--r--doc/sphinxext/numpydoc/linkcode.py2
-rw-r--r--doc/sphinxext/numpydoc/numpydoc.py2
-rw-r--r--doc/sphinxext/numpydoc/phantom_import.py2
-rw-r--r--doc/sphinxext/numpydoc/plot_directive.py2
-rw-r--r--doc/sphinxext/numpydoc/tests/test_docscrape.py2
-rw-r--r--doc/sphinxext/numpydoc/traitsdoc.py2
10 files changed, 10 insertions, 10 deletions
diff --git a/doc/sphinxext/numpydoc/comment_eater.py b/doc/sphinxext/numpydoc/comment_eater.py
index 0e205072e..74d0d4768 100644
--- a/doc/sphinxext/numpydoc/comment_eater.py
+++ b/doc/sphinxext/numpydoc/comment_eater.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import sys
if sys.version_info[0] >= 3:
diff --git a/doc/sphinxext/numpydoc/compiler_unparse.py b/doc/sphinxext/numpydoc/compiler_unparse.py
index 56da748d1..bb76f7ea3 100644
--- a/doc/sphinxext/numpydoc/compiler_unparse.py
+++ b/doc/sphinxext/numpydoc/compiler_unparse.py
@@ -10,7 +10,7 @@
fixme: We may want to move to using _ast trees because the compiler for
them is about 6 times faster than compiler.compile.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys
from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add
diff --git a/doc/sphinxext/numpydoc/docscrape.py b/doc/sphinxext/numpydoc/docscrape.py
index 0fe259447..af76b86e5 100644
--- a/doc/sphinxext/numpydoc/docscrape.py
+++ b/doc/sphinxext/numpydoc/docscrape.py
@@ -1,7 +1,7 @@
"""Extract reference documentation from the NumPy source tree.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys
import inspect
diff --git a/doc/sphinxext/numpydoc/docscrape_sphinx.py b/doc/sphinxext/numpydoc/docscrape_sphinx.py
index 14d766d84..1248253b3 100644
--- a/doc/sphinxext/numpydoc/docscrape_sphinx.py
+++ b/doc/sphinxext/numpydoc/docscrape_sphinx.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
import re, inspect, textwrap, pydoc
import sphinx
diff --git a/doc/sphinxext/numpydoc/linkcode.py b/doc/sphinxext/numpydoc/linkcode.py
index 58361e8c3..986f39384 100644
--- a/doc/sphinxext/numpydoc/linkcode.py
+++ b/doc/sphinxext/numpydoc/linkcode.py
@@ -9,7 +9,7 @@
:license: BSD, see LICENSE for details.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import warnings
import collections
diff --git a/doc/sphinxext/numpydoc/numpydoc.py b/doc/sphinxext/numpydoc/numpydoc.py
index 0243d23c4..d95d476ef 100644
--- a/doc/sphinxext/numpydoc/numpydoc.py
+++ b/doc/sphinxext/numpydoc/numpydoc.py
@@ -15,7 +15,7 @@ It will:
.. [1] https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sphinx
import collections
diff --git a/doc/sphinxext/numpydoc/phantom_import.py b/doc/sphinxext/numpydoc/phantom_import.py
index 6308f492d..855068834 100644
--- a/doc/sphinxext/numpydoc/phantom_import.py
+++ b/doc/sphinxext/numpydoc/phantom_import.py
@@ -14,7 +14,7 @@ without needing to rebuild the documented module.
.. [1] http://code.google.com/p/pydocweb
"""
-from __future__ import division
+from __future__ import division, absolute_import
import imp, sys, compiler, types, os, inspect, re
diff --git a/doc/sphinxext/numpydoc/plot_directive.py b/doc/sphinxext/numpydoc/plot_directive.py
index 7547642a2..9e92acabb 100644
--- a/doc/sphinxext/numpydoc/plot_directive.py
+++ b/doc/sphinxext/numpydoc/plot_directive.py
@@ -74,7 +74,7 @@ TODO
to make them appear side-by-side, or in floats.
"""
-from __future__ import division
+from __future__ import division, absolute_import
import sys, os, glob, shutil, imp, warnings, re, textwrap, traceback
import sphinx
diff --git a/doc/sphinxext/numpydoc/tests/test_docscrape.py b/doc/sphinxext/numpydoc/tests/test_docscrape.py
index 07ac68003..ce99754da 100644
--- a/doc/sphinxext/numpydoc/tests/test_docscrape.py
+++ b/doc/sphinxext/numpydoc/tests/test_docscrape.py
@@ -1,5 +1,5 @@
# -*- encoding:utf-8 -*-
-from __future__ import division
+from __future__ import division, absolute_import
import sys, textwrap
diff --git a/doc/sphinxext/numpydoc/traitsdoc.py b/doc/sphinxext/numpydoc/traitsdoc.py
index 784c4fc2f..74c226ab4 100644
--- a/doc/sphinxext/numpydoc/traitsdoc.py
+++ b/doc/sphinxext/numpydoc/traitsdoc.py
@@ -13,7 +13,7 @@ for Traits is required.
.. [2] http://code.enthought.com/projects/traits/
"""
-from __future__ import division
+from __future__ import division, absolute_import
import inspect
import os