Merge pull request numpy#6775 from charris/add-future-imports

charris · charris · commit f1c5451e0521 · 2015-12-07T14:59:33.000-07:00
MAINT: Include from __future__ boilerplate in some files missing it.
diff --git a/numpy/_build_utils/apple_accelerate.py b/numpy/_build_utils/apple_accelerate.py
@@ -1,3 +1,5 @@
+from __future__ import division, absolute_import, print_function
+
 import os
 import sys
 import re
diff --git a/numpy/compat/tests/test_compat.py b/numpy/compat/tests/test_compat.py
@@ -1,3 +1,5 @@
+from __future__ import division, absolute_import, print_function
+
 from os.path import join
 
 from numpy.compat import isfileobj
diff --git a/numpy/core/tests/test_scalarinherit.py b/numpy/core/tests/test_scalarinherit.py
@@ -2,6 +2,7 @@
 """ Test printing of scalar types.
 
 """
+from __future__ import division, absolute_import, print_function
 
 import numpy as np
 from numpy.testing import TestCase, run_module_suite
diff --git a/numpy/distutils/msvc9compiler.py b/numpy/distutils/msvc9compiler.py
@@ -1,3 +1,5 @@
+from __future__ import division, absolute_import, print_function
+
 import os
 import distutils.msvc9compiler
 from distutils.msvc9compiler import *
diff --git a/numpy/distutils/msvccompiler.py b/numpy/distutils/msvccompiler.py
@@ -1,3 +1,5 @@
+from __future__ import division, absolute_import, print_function
+
 import os
 import distutils.msvccompiler
 from distutils.msvccompiler import *
diff --git a/numpy/f2py/__main__.py b/numpy/f2py/__main__.py
@@ -1,4 +1,6 @@
 # See http://cens.ioc.ee/projects/f2py2e/
+from __future__ import division, print_function
+
 import os
 import sys
 for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
diff --git a/numpy/lib/tests/test_packbits.py b/numpy/lib/tests/test_packbits.py
@@ -1,5 +1,6 @@
-import numpy as np
+from __future__ import division, absolute_import, print_function
 
+import numpy as np
 from numpy.testing import assert_array_equal, assert_equal, assert_raises
 
 
diff --git a/numpy/linalg/tests/test_deprecations.py b/numpy/linalg/tests/test_deprecations.py
@@ -1,6 +1,8 @@
 """Test deprecation and future warnings.
 
 """
+from __future__ import division, absolute_import, print_function
+
 import numpy as np
 from numpy.testing import assert_warns, run_module_suite
 
diff --git a/pavement.py b/pavement.py
@@ -54,7 +54,7 @@
     - fix bdist_mpkg: we build the same source twice -> how to make sure we use
       the same underlying python for egg install in venv and for bdist_mpkg
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import division, print_function
 
 # What need to be installed to build everything on mac os x:
 #   - wine: python 2.6 and 2.5 + makensis + cpuid plugin + mingw, all in the PATH
diff --git a/runtests.py b/runtests.py
@@ -24,6 +24,7 @@
     $ python runtests.py --lcov-html
 
 """
+from __future__ import division, print_function
 
 #
 # This is a generic test runner script for projects using Numpy's test
diff --git a/tools/win32build/build-cpucaps.py b/tools/win32build/build-cpucaps.py
@@ -1,3 +1,5 @@
+from __future__ import division, print_function
+
 import os
 import subprocess
 # build cpucaps.dll

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import division, absolute_import, print_function`
	`2`	`+`
`1`	`3`	`import os`
`2`	`4`	`import sys`
`3`	`5`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import division, absolute_import, print_function`
	`2`	`+`
`1`	`3`	`from os.path import join`
`2`	`4`
`3`	`5`	`from numpy.compat import isfileobj`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`$ python runtests.py --lcov-html`
`25`	`25`
`26`	`26`	`"""`
	`27`	`+from __future__ import division, print_function`
`27`	`28`
`28`	`29`	`#`
`29`	`30`	`# This is a generic test runner script for projects using Numpy's test`