diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 10:43:49 -0800 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 10:43:49 -0800 |
commit | d12dad4d42a4684d1e0a40c0105772ebab92d6bc (patch) | |
tree | 91609b16e08199176342f0a50776135e48d34334 /numpy/compat | |
parent | 890ee94dd90769d303025e10d906f584088516d3 (diff) | |
parent | cabc07e185a0ffad5f8055760b385aa5cca85896 (diff) | |
download | python-numpy-d12dad4d42a4684d1e0a40c0105772ebab92d6bc.tar.gz python-numpy-d12dad4d42a4684d1e0a40c0105772ebab92d6bc.tar.bz2 python-numpy-d12dad4d42a4684d1e0a40c0105772ebab92d6bc.zip |
Merge pull request #3026 from charris/2to3-fix-print
2to3: Put `from __future__ import division` in every python file.
Diffstat (limited to 'numpy/compat')
-rw-r--r-- | numpy/compat/__init__.py | 2 | ||||
-rw-r--r-- | numpy/compat/_inspect.py | 2 | ||||
-rw-r--r-- | numpy/compat/py3k.py | 1 | ||||
-rw-r--r-- | numpy/compat/setup.py | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/numpy/compat/__init__.py b/numpy/compat/__init__.py index 9b4261616..930be5a90 100644 --- a/numpy/compat/__init__.py +++ b/numpy/compat/__init__.py @@ -8,6 +8,8 @@ extensions, which may be included for the following reasons: * we may only need a small subset of the copied library/module """ +from __future__ import division + import _inspect import py3k from _inspect import getargspec, formatargspec diff --git a/numpy/compat/_inspect.py b/numpy/compat/_inspect.py index 89b30ef86..cb9717ced 100644 --- a/numpy/compat/_inspect.py +++ b/numpy/compat/_inspect.py @@ -3,7 +3,9 @@ We use this instead of upstream because upstream inspect is slow to import, and significanly contributes to numpy import times. Importing this copy has almost no overhead. + """ +from __future__ import division import types diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py index 0a03929be..594acc1e0 100644 --- a/numpy/compat/py3k.py +++ b/numpy/compat/py3k.py @@ -2,6 +2,7 @@ Python 3 compatibility tools. """ +from __future__ import division __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar', 'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested', diff --git a/numpy/compat/setup.py b/numpy/compat/setup.py index 4e0781085..3de064650 100644 --- a/numpy/compat/setup.py +++ b/numpy/compat/setup.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +from __future__ import division + def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration |