Merge pull request #3026 from charris/2to3-fix-print

2to3: Put `from __future__ import division` in every python file.

18 files changed, 44 insertions, 2 deletions

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