diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-27 13:26:58 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 11:22:47 -0700 |
commit | 6aa264c4bad9c89ccdd9ecd5a1cb5ef10643ec51 (patch) | |
tree | 15cad18dacf1ef03380c957ed9af4f39b94c5012 /numpy/distutils | |
parent | 3c13c0a925276130d66be490eed4ae337712cce2 (diff) | |
download | numpy-6aa264c4bad9c89ccdd9ecd5a1cb5ef10643ec51.tar.gz |
2to3: Put `from __future__ import division in every python file.
This should be harmless, as we already are division clean. However,
placement of this import takes some care. In the future a script
can be used to append new features without worry, at least until
such time as it exceeds a single line. Having that ability will
make it easier to deal with absolute imports and printing updates.
Diffstat (limited to 'numpy/distutils')
80 files changed, 149 insertions, 3 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index cdc5d45b6..5b68de74f 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys if sys.version_info[0] < 3: diff --git a/numpy/distutils/__version__.py b/numpy/distutils/__version__.py index 06077f79c..c9af8cdb1 100644 --- a/numpy/distutils/__version__.py +++ b/numpy/distutils/__version__.py @@ -1,3 +1,5 @@ +from __future__ import division + major = 0 minor = 4 micro = 0 diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index e3b88af08..4478154f8 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -1,3 +1,5 @@ +from __future__ import division + import re import os import sys diff --git a/numpy/distutils/command/__init__.py b/numpy/distutils/command/__init__.py index f8f0884da..09fe78d22 100644 --- a/numpy/distutils/command/__init__.py +++ b/numpy/distutils/command/__init__.py @@ -1,7 +1,17 @@ """distutils.command Package containing implementation of all the standard Distutils -commands.""" +commands. + +""" +from __future__ import division + +def test_na_writable_attributes_deletion(): + a = np.NA(2) + attr = ['payload', 'dtype'] + for s in attr: + assert_raises(AttributeError, delattr, a, s) + __revision__ = "$Id: __init__.py,v 1.3 2005/05/16 11:08:49 pearu Exp $" diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py index fe40119ef..2e31fe22a 100644 --- a/numpy/distutils/command/autodist.py +++ b/numpy/distutils/command/autodist.py @@ -1,4 +1,8 @@ -"""This module implements additional tests ala autoconf which can be useful.""" +"""This module implements additional tests ala autoconf which can be useful. + +""" +from __future__ import division + # We put them here since they could be easily reused outside numpy.distutils diff --git a/numpy/distutils/command/bdist_rpm.py b/numpy/distutils/command/bdist_rpm.py index 60e9b5752..302c6fdd2 100644 --- a/numpy/distutils/command/bdist_rpm.py +++ b/numpy/distutils/command/bdist_rpm.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import sys if 'setuptools' in sys.modules: diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index 5d986570c..239cafe1e 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import sys from distutils.command.build import build as old_build diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index d9cfca73e..99144d7b5 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -1,5 +1,6 @@ """ Modified version of build_clib that handles fortran source files. """ +from __future__ import division import os from glob import glob diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 3a552897c..2245661a5 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -1,5 +1,7 @@ """ Modified version of build_ext that handles fortran source files. + """ +from __future__ import division import os import sys diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py index 6e3073c43..e8c7b8f83 100644 --- a/numpy/distutils/command/build_py.py +++ b/numpy/distutils/command/build_py.py @@ -1,3 +1,4 @@ +from __future__ import division from distutils.command.build_py import build_py as old_build_py from numpy.distutils.misc_util import is_string diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index 99134f202..1a3d26d58 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -1,5 +1,7 @@ """ Modified version of build_scripts that handles building scripts from functions. + """ +from __future__ import division from distutils.command.build_scripts import build_scripts as old_build_scripts from numpy.distutils import log diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index d3611131f..a9e66e6f4 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -1,5 +1,6 @@ """ Build swig, f2py, pyrex sources. """ +from __future__ import division import os import re diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 85a86990f..3417fac44 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -2,6 +2,7 @@ # try_compile call. try_run works but is untested for most of Fortran # compilers (they must define linker_exe first). # Pearu Peterson +from __future__ import division import os, signal import warnings diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py index e7fee94df..6894b4552 100644 --- a/numpy/distutils/command/config_compiler.py +++ b/numpy/distutils/command/config_compiler.py @@ -1,3 +1,5 @@ +from __future__ import division + from distutils.core import Command from numpy.distutils import log diff --git a/numpy/distutils/command/develop.py b/numpy/distutils/command/develop.py index 167706671..8328effcf 100644 --- a/numpy/distutils/command/develop.py +++ b/numpy/distutils/command/develop.py @@ -1,7 +1,9 @@ """ Override the develop command from setuptools so we can ensure that our generated files (from build_src or build_scripts) are properly converted to real files with filenames. + """ +from __future__ import division from setuptools.command.develop import develop as old_develop diff --git a/numpy/distutils/command/egg_info.py b/numpy/distutils/command/egg_info.py index 687faf080..33c64b0e4 100644 --- a/numpy/distutils/command/egg_info.py +++ b/numpy/distutils/command/egg_info.py @@ -1,3 +1,5 @@ +from __future__ import division + from setuptools.command.egg_info import egg_info as _egg_info class egg_info(_egg_info): diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py index ad3cc507d..ea898ade9 100644 --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys if 'setuptools' in sys.modules: import setuptools.command.install as old_install_mod diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py index 638d4beac..8845cedab 100644 --- a/numpy/distutils/command/install_clib.py +++ b/numpy/distutils/command/install_clib.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from distutils.core import Command from distutils.ccompiler import new_compiler diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py index 0a2e68ae1..d99d656db 100644 --- a/numpy/distutils/command/install_data.py +++ b/numpy/distutils/command/install_data.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys have_setuptools = ('setuptools' in sys.modules) diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py index 58ace1064..548c3c643 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from distutils.command.install_headers import install_headers as old_install_headers diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index 62fce9574..3e07f7a01 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys if 'setuptools' in sys.modules: from setuptools.command.sdist import sdist as old_sdist diff --git a/numpy/distutils/compat.py b/numpy/distutils/compat.py index 1c37dc2b9..55b9627d5 100644 --- a/numpy/distutils/compat.py +++ b/numpy/distutils/compat.py @@ -1,6 +1,9 @@ """Small modules to cope with python 2 vs 3 incompatibilities inside numpy.distutils + """ +from __future__ import division + import sys def get_exception(): diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py index 368cdd457..61200e0c1 100644 --- a/numpy/distutils/conv_template.py +++ b/numpy/distutils/conv_template.py @@ -78,6 +78,8 @@ Example: 3, 3, jim """ +from __future__ import division + __all__ = ['process_str', 'process_file'] diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index 535b5ed52..092ea4442 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -1,3 +1,4 @@ +from __future__ import division import sys from distutils.core import * diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index 96bf37bb3..86a18993a 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -10,7 +10,9 @@ this distribution for specifics. NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. Pearu Peterson + """ +from __future__ import division __all__ = ['cpu'] diff --git a/numpy/distutils/environment.py b/numpy/distutils/environment.py index 7d3ae56ae..015815cbe 100644 --- a/numpy/distutils/environment.py +++ b/numpy/distutils/environment.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from distutils.dist import Distribution diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py index 7657b8735..f05b56429 100644 --- a/numpy/distutils/exec_command.py +++ b/numpy/distutils/exec_command.py @@ -44,6 +44,7 @@ Known bugs: - Tests, that send messages to stderr, fail when executed from MSYS prompt because the messages are lost at some point. """ +from __future__ import division __all__ = ['exec_command','find_executable'] diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py index 2fc29f6d5..95213644f 100644 --- a/numpy/distutils/extension.py +++ b/numpy/distutils/extension.py @@ -4,7 +4,9 @@ Provides the Extension class, used to describe C/C++ extension modules in setup scripts. Overridden to support f2py. + """ +from __future__ import division __revision__ = "$Id: extension.py,v 1.1 2005/04/09 19:29:34 pearu Exp $" diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index 6f92af96c..70093e037 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -11,7 +11,9 @@ file, like 'gcc', that is executed, and should be a string. In contrast, should be a list. But note that FCompiler.executables is actually a dictionary of commands. + """ +from __future__ import division __all__ = ['FCompiler','new_fcompiler','show_fcompilers', 'dummy_fortran_file'] diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index e36f0ff78..7c06d70a3 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -5,6 +5,7 @@ # Notes: # - when using -g77 then use -DUNDERSCORE_G77 to compile f2py # generated extension modules (works for f2py v2.45.241_1936 and up) +from __future__ import division import os diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py index a00d8bdb8..d67c1f24e 100644 --- a/numpy/distutils/fcompiler/compaq.py +++ b/numpy/distutils/fcompiler/compaq.py @@ -1,5 +1,6 @@ #http://www.compaq.com/fortran/docs/ +from __future__ import division import os import sys diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py index 9352a0b7b..478f48f3e 100644 --- a/numpy/distutils/fcompiler/g95.py +++ b/numpy/distutils/fcompiler/g95.py @@ -1,4 +1,5 @@ # http://g95.sourceforge.net/ +from __future__ import division from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index bb832991f..a2e613d0c 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -1,3 +1,5 @@ +from __future__ import division + import re import os import sys diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py index 866920ee5..44bfbe1c2 100644 --- a/numpy/distutils/fcompiler/hpux.py +++ b/numpy/distutils/fcompiler/hpux.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.distutils.fcompiler import FCompiler compilers = ['HPUXFCompiler'] diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py index 113134bbd..70373c0b0 100644 --- a/numpy/distutils/fcompiler/ibm.py +++ b/numpy/distutils/fcompiler/ibm.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import re import sys diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index 281bbe0cb..53ea7af05 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -1,4 +1,5 @@ # http://developer.intel.com/software/products/compilers/flin/ +from __future__ import division import sys diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py index cf2950624..06c4c6f56 100644 --- a/numpy/distutils/fcompiler/lahey.py +++ b/numpy/distutils/fcompiler/lahey.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py index 3c2e9ac84..6cd2fdfac 100644 --- a/numpy/distutils/fcompiler/mips.py +++ b/numpy/distutils/fcompiler/mips.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.distutils.cpuinfo import cpu from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py index 4aca48450..11253c4be 100644 --- a/numpy/distutils/fcompiler/nag.py +++ b/numpy/distutils/fcompiler/nag.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py index 526b42d49..e99c2ab35 100644 --- a/numpy/distutils/fcompiler/none.py +++ b/numpy/distutils/fcompiler/none.py @@ -1,3 +1,4 @@ +from __future__ import division from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py index 29881f4cf..c9bd58c62 100644 --- a/numpy/distutils/fcompiler/pathf95.py +++ b/numpy/distutils/fcompiler/pathf95.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.distutils.fcompiler import FCompiler compilers = ['PathScaleFCompiler'] diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index 6ea3c03d6..e0f5e0d44 100644 --- a/numpy/distutils/fcompiler/pg.py +++ b/numpy/distutils/fcompiler/pg.py @@ -1,5 +1,5 @@ - # http://www.pgroup.com +from __future__ import division from numpy.distutils.fcompiler import FCompiler from sys import platform diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py index 85e2c3377..7deeac29a 100644 --- a/numpy/distutils/fcompiler/sun.py +++ b/numpy/distutils/fcompiler/sun.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.distutils.ccompiler import simple_version_match from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py index a7b99ce73..bddc1be91 100644 --- a/numpy/distutils/fcompiler/vast.py +++ b/numpy/distutils/fcompiler/vast.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from numpy.distutils.fcompiler.gnu import GnuFCompiler diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py index 413f0721d..1bb7a0a27 100644 --- a/numpy/distutils/from_template.py +++ b/numpy/distutils/from_template.py @@ -45,6 +45,7 @@ process_file(filename) <ctypereal=float,double,\\0,\\1> """ +from __future__ import division __all__ = ['process_str','process_file'] diff --git a/numpy/distutils/info.py b/numpy/distutils/info.py index 3d27a8092..4d8b847bd 100644 --- a/numpy/distutils/info.py +++ b/numpy/distutils/info.py @@ -1,5 +1,6 @@ """ Enhanced distutils with Fortran compilers support and more. """ +from __future__ import division postpone_import = True diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 9cff858ce..8c3af0957 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -1,3 +1,5 @@ +from __future__ import division + from distutils.unixccompiler import UnixCCompiler from numpy.distutils.exec_command import find_executable diff --git a/numpy/distutils/interactive.py b/numpy/distutils/interactive.py index 896a7d91e..a75d5a7e8 100644 --- a/numpy/distutils/interactive.py +++ b/numpy/distutils/interactive.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import sys from pprint import pformat diff --git a/numpy/distutils/lib2def.py b/numpy/distutils/lib2def.py index a486b13bd..0e98e17ef 100644 --- a/numpy/distutils/lib2def.py +++ b/numpy/distutils/lib2def.py @@ -1,3 +1,5 @@ +from __future__ import division + import re import sys import os diff --git a/numpy/distutils/line_endings.py b/numpy/distutils/line_endings.py index 4e6c1f38e..f18850716 100644 --- a/numpy/distutils/line_endings.py +++ b/numpy/distutils/line_endings.py @@ -1,5 +1,7 @@ """ Functions for converting from DOS to UNIX line endings + """ +from __future__ import division import sys, re, os diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py index fe44bb443..a3f4cb9ff 100644 --- a/numpy/distutils/log.py +++ b/numpy/distutils/log.py @@ -1,4 +1,5 @@ # Colored log, requires Python 2.3 or up. +from __future__ import division import sys from distutils.log import * diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index 4050544f1..c98d240b8 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -7,6 +7,7 @@ Support code for building Python extensions on Windows. # 3. Force windows to use g77 """ +from __future__ import division import os import subprocess diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index ef7c3a079..c22aacb9a 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import re import sys diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index 9eed5d0f6..6f3072885 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys if sys.version_info[0] < 3: from ConfigParser import SafeConfigParser, NoOptionError diff --git a/numpy/distutils/numpy_distribution.py b/numpy/distutils/numpy_distribution.py index ea8182659..276f81398 100644 --- a/numpy/distutils/numpy_distribution.py +++ b/numpy/distutils/numpy_distribution.py @@ -1,4 +1,6 @@ # XXX: Handle setuptools ? +from __future__ import division + from distutils.core import Distribution # This class is used because we add new files (sconscripts, and so on) with the diff --git a/numpy/distutils/pathccompiler.py b/numpy/distutils/pathccompiler.py index 48051810e..2e5b76a53 100644 --- a/numpy/distutils/pathccompiler.py +++ b/numpy/distutils/pathccompiler.py @@ -1,3 +1,5 @@ +from __future__ import division + from distutils.unixccompiler import UnixCCompiler class PathScaleCCompiler(UnixCCompiler): diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py index afc1fadd2..1d29d706c 100644 --- a/numpy/distutils/setup.py +++ b/numpy/distutils/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import division def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 7b99a701a..68a9ba5a9 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -108,7 +108,9 @@ terms of the NumPy (BSD style) license. See LICENSE.txt that came with this distribution for specifics. NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + """ +from __future__ import division import sys import os diff --git a/numpy/distutils/tests/f2py_ext/__init__.py b/numpy/distutils/tests/f2py_ext/__init__.py index e69de29bb..b06eaf1a4 100644 --- a/numpy/distutils/tests/f2py_ext/__init__.py +++ b/numpy/distutils/tests/f2py_ext/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py index e3dfddb74..edaa22287 100644 --- a/numpy/distutils/tests/f2py_ext/setup.py +++ b/numpy/distutils/tests/f2py_ext/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 config = Configuration('f2py_ext',parent_package,top_path) diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py index 027f455de..696ee41d8 100644 --- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py +++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from f2py_ext import fib2 diff --git a/numpy/distutils/tests/f2py_f90_ext/__init__.py b/numpy/distutils/tests/f2py_f90_ext/__init__.py index e69de29bb..b06eaf1a4 100644 --- a/numpy/distutils/tests/f2py_f90_ext/__init__.py +++ b/numpy/distutils/tests/f2py_f90_ext/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py index ee56cc3a6..0a6bea989 100644 --- a/numpy/distutils/tests/f2py_f90_ext/setup.py +++ b/numpy/distutils/tests/f2py_f90_ext/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 config = Configuration('f2py_f90_ext',parent_package,top_path) diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py index 1543051dc..3fa7b3730 100644 --- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py +++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from f2py_f90_ext import foo diff --git a/numpy/distutils/tests/gen_ext/__init__.py b/numpy/distutils/tests/gen_ext/__init__.py index e69de29bb..b06eaf1a4 100644 --- a/numpy/distutils/tests/gen_ext/__init__.py +++ b/numpy/distutils/tests/gen_ext/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py index bf029062c..cbf135dc1 100644 --- a/numpy/distutils/tests/gen_ext/setup.py +++ b/numpy/distutils/tests/gen_ext/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import division fib3_f = ''' C FILE: FIB3.F diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py index 8a9a443a5..3fa72036e 100644 --- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py +++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from gen_ext import fib3 diff --git a/numpy/distutils/tests/pyrex_ext/__init__.py b/numpy/distutils/tests/pyrex_ext/__init__.py index e69de29bb..b06eaf1a4 100644 --- a/numpy/distutils/tests/pyrex_ext/__init__.py +++ b/numpy/distutils/tests/pyrex_ext/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/distutils/tests/pyrex_ext/setup.py b/numpy/distutils/tests/pyrex_ext/setup.py index 5b348b916..287ec5e3b 100644 --- a/numpy/distutils/tests/pyrex_ext/setup.py +++ b/numpy/distutils/tests/pyrex_ext/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 config = Configuration('pyrex_ext',parent_package,top_path) diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py index eb2c91da7..96f73c426 100644 --- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py +++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from pyrex_ext.primes import primes diff --git a/numpy/distutils/tests/setup.py b/numpy/distutils/tests/setup.py index 89d73800e..c472e1788 100644 --- a/numpy/distutils/tests/setup.py +++ b/numpy/distutils/tests/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 config = Configuration('testnumpydistutils',parent_package,top_path) diff --git a/numpy/distutils/tests/swig_ext/__init__.py b/numpy/distutils/tests/swig_ext/__init__.py index e69de29bb..b06eaf1a4 100644 --- a/numpy/distutils/tests/swig_ext/__init__.py +++ b/numpy/distutils/tests/swig_ext/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py index 7f0dbe627..99b688985 100644 --- a/numpy/distutils/tests/swig_ext/setup.py +++ b/numpy/distutils/tests/swig_ext/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 config = Configuration('swig_ext',parent_package,top_path) diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py index 9afc01cb2..5a4765fa7 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from swig_ext import example diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py index 42d1fcbcd..c3c4727c0 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example2.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from swig_ext import example2 diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py index 6a36fb160..d3b38db23 100644 --- a/numpy/distutils/tests/test_fcompiler_gnu.py +++ b/numpy/distutils/tests/test_fcompiler_gnu.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * import numpy.distutils.fcompiler diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py index ad03daeea..4ebf1a0c0 100644 --- a/numpy/distutils/tests/test_fcompiler_intel.py +++ b/numpy/distutils/tests/test_fcompiler_intel.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * import numpy.distutils.fcompiler diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py index 448800b68..57fde8899 100644 --- a/numpy/distutils/tests/test_misc_util.py +++ b/numpy/distutils/tests/test_misc_util.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import division from numpy.testing import * from numpy.distutils.misc_util import appendpath, minrelpath, gpaths, rel_path diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py index 6122e303b..d3568eb6b 100644 --- a/numpy/distutils/tests/test_npy_pkg_config.py +++ b/numpy/distutils/tests/test_npy_pkg_config.py @@ -1,3 +1,5 @@ +from __future__ import division + import os from tempfile import mkstemp diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py index dfc5a676f..837ce5092 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py @@ -1,6 +1,8 @@ """ unixccompiler - can handle very long argument lists for ar. + """ +from __future__ import division import os |