diff options
422 files changed, 888 insertions, 894 deletions
diff --git a/doc/cdoc/numpyfilter.py b/doc/cdoc/numpyfilter.py index d5021f92a..32c6dffcb 100755 --- a/doc/cdoc/numpyfilter.py +++ b/doc/cdoc/numpyfilter.py @@ -6,7 +6,7 @@ Interpret C comments as ReStructuredText, and replace them by the HTML output. Also, add Doxygen /** and /**< syntax automatically where appropriate. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re diff --git a/doc/cython/run_test.py b/doc/cython/run_test.py index 986016c7a..5ffd7e80f 100755 --- a/doc/cython/run_test.py +++ b/doc/cython/run_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpyx import test test() diff --git a/doc/cython/setup.py b/doc/cython/setup.py index 0b063fef9..fe122d4db 100755 --- a/doc/cython/setup.py +++ b/doc/cython/setup.py @@ -5,7 +5,7 @@ Note: Cython is the successor project to Pyrex. For more information, see http://cython.org. """ -from __future__ import division +from __future__ import division, print_function from distutils.core import setup from distutils.extension import Extension diff --git a/doc/example.py b/doc/example.py index e01640948..71c1a2f30 100644 --- a/doc/example.py +++ b/doc/example.py @@ -8,7 +8,7 @@ extend over multiple lines, the closing three quotation marks must be on a line by itself, preferably preceeded by a blank line. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os # standard library imports first diff --git a/doc/newdtype_example/example.py b/doc/newdtype_example/example.py index f6251c0b9..6e9bf4334 100644 --- a/doc/newdtype_example/example.py +++ b/doc/newdtype_example/example.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import floatint.floatint as ff import numpy as np @@ -12,7 +12,7 @@ g = np.array([1,2,3,4,5,6,7,8]).view(ff.floatint_type) # Now, the elements will be the scalar type associated # with the ndarray. -print g[0] -print type(g[1]) +print(g[0]) +print(type(g[1])) # Now, you need to register ufuncs and more arrfuncs to do useful things... diff --git a/doc/newdtype_example/floatint/__init__.py b/doc/newdtype_example/floatint/__init__.py index b4895eb4c..ebede2753 100644 --- a/doc/newdtype_example/floatint/__init__.py +++ b/doc/newdtype_example/floatint/__init__.py @@ -1,3 +1,3 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/doc/newdtype_example/setup.py b/doc/newdtype_example/setup.py index 2d9ed6c99..494343b28 100644 --- a/doc/newdtype_example/setup.py +++ b/doc/newdtype_example/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function from numpy.distutils.core import setup diff --git a/doc/numpybook/comparison/ctypes/filter.py b/doc/numpybook/comparison/ctypes/filter.py index 16acec04b..13d768027 100644 --- a/doc/numpybook/comparison/ctypes/filter.py +++ b/doc/numpybook/comparison/ctypes/filter.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['filter2d'] diff --git a/doc/numpybook/comparison/ctypes/interface.py b/doc/numpybook/comparison/ctypes/interface.py index 651ee9439..34e34ca71 100644 --- a/doc/numpybook/comparison/ctypes/interface.py +++ b/doc/numpybook/comparison/ctypes/interface.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['add', 'filter2d'] diff --git a/doc/numpybook/comparison/pyrex/setup.py b/doc/numpybook/comparison/pyrex/setup.py index f0c764955..3fb69a705 100644 --- a/doc/numpybook/comparison/pyrex/setup.py +++ b/doc/numpybook/comparison/pyrex/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function from distutils.core import setup from distutils.extension import Extension diff --git a/doc/numpybook/comparison/timing.py b/doc/numpybook/comparison/timing.py index 59978ba35..0d47c7eba 100644 --- a/doc/numpybook/comparison/timing.py +++ b/doc/numpybook/comparison/timing.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import timeit @@ -54,9 +54,9 @@ path = sys.path for kind in ['f2py']:#['ctypes', 'pyrex', 'weave', 'f2py']: res[kind] = [] sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path - print sys.path + print(sys.path) for n in N: - print "%s - %d" % (kind, n) + print("%s - %d" % (kind, n)) t = timeit.Timer(eval('%s_run'%kind), eval('%s_pre %% (%d,%d)'%(kind,n,n))) mytime = min(t.repeat(3,100)) res[kind].append(mytime) diff --git a/doc/numpybook/comparison/weave/filter.py b/doc/numpybook/comparison/weave/filter.py index 9fa726a79..bbdc9ea85 100644 --- a/doc/numpybook/comparison/weave/filter.py +++ b/doc/numpybook/comparison/weave/filter.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from scipy import weave, zeros_like diff --git a/doc/numpybook/comparison/weave/inline.py b/doc/numpybook/comparison/weave/inline.py index 9c134b231..3906553ed 100644 --- a/doc/numpybook/comparison/weave/inline.py +++ b/doc/numpybook/comparison/weave/inline.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from scipy import weave from numpy import rand, zeros_like @@ -40,8 +40,8 @@ def arr(a): return b a = [None]*10 -print example1(a) -print a +print(example1(a)) +print(a) a = rand(512,512) b = arr(a) diff --git a/doc/numpybook/runcode.py b/doc/numpybook/runcode.py index 858168e11..456846cad 100644 --- a/doc/numpybook/runcode.py +++ b/doc/numpybook/runcode.py @@ -14,7 +14,7 @@ Options: -n name of code section (default MyCode) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import optparse @@ -25,8 +25,8 @@ import os newre = re.compile(r"\\begin_inset Note.*PYNEW\s+\\end_inset", re.DOTALL) def getoutput(tstr, dic): - print "\n\nRunning..." - print tstr, + print("\n\nRunning...") + print(tstr, end=' ') tempstr = io.StringIO() sys.stdout = tempstr code = compile(tstr, '<input>', 'exec') @@ -44,8 +44,8 @@ def getoutput(tstr, dic): else: res = tempstr.getvalue() + '\n' + repr(res) if res != '': - print "\nOutput is" - print res, + print("\nOutput is") + print(res, end=' ') return res # now find the code in the code segment @@ -90,7 +90,7 @@ def runpycode(lyxstr, name='MyCode'): num += 1 if num == 0: - print "Nothing found for %s" % name + print("Nothing found for %s" % name) return lyxstr start = 0 @@ -141,7 +141,7 @@ def main(args): fid = file(args[0]) str = fid.read() fid.close() - print "Processing %s" % options.name + print("Processing %s" % options.name) newstr = runpycode(str, options.name) fid = file(args[0],'w') fid.write(newstr) diff --git a/doc/postprocess.py b/doc/postprocess.py index 195ab9d96..f0ca22cd5 100755 --- a/doc/postprocess.py +++ b/doc/postprocess.py @@ -6,7 +6,7 @@ Post-processes HTML and Latex files output by Sphinx. MODE is either 'html' or 'tex'. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re, optparse diff --git a/doc/pyrex/run_test.py b/doc/pyrex/run_test.py index 986016c7a..5ffd7e80f 100755 --- a/doc/pyrex/run_test.py +++ b/doc/pyrex/run_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpyx import test test() diff --git a/doc/pyrex/setup.py b/doc/pyrex/setup.py index 648bad9f4..361ccb183 100644 --- a/doc/pyrex/setup.py +++ b/doc/pyrex/setup.py @@ -12,7 +12,7 @@ http://www.scipy.org/Cookbook/Pyrex_and_NumPy http://www.scipy.org/Cookbook/ArrayStruct_and_Pyrex """ -from __future__ import division +from __future__ import division, print_function from distutils.core import setup from distutils.extension import Extension diff --git a/doc/source/conf.py b/doc/source/conf.py index 8b29316cb..0fa905111 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, os, re diff --git a/doc/sphinxext/numpydoc/__init__.py b/doc/sphinxext/numpydoc/__init__.py index 9fa06e37c..0fce2cf74 100644 --- a/doc/sphinxext/numpydoc/__init__.py +++ b/doc/sphinxext/numpydoc/__init__.py @@ -1,3 +1,3 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .numpydoc import setup diff --git a/doc/sphinxext/numpydoc/comment_eater.py b/doc/sphinxext/numpydoc/comment_eater.py index 2c7f4da31..8b57c4b7a 100644 --- a/doc/sphinxext/numpydoc/comment_eater.py +++ b/doc/sphinxext/numpydoc/comment_eater.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 c36389d13..7c2001305 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, absolute_import +from __future__ import division, absolute_import, print_function 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 59d3f9734..a36171855 100644 --- a/doc/sphinxext/numpydoc/docscrape.py +++ b/doc/sphinxext/numpydoc/docscrape.py @@ -1,9 +1,8 @@ """Extract reference documentation from the NumPy source tree. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function -import sys import inspect import textwrap import re @@ -11,10 +10,6 @@ import pydoc from warnings import warn import collections -if sys.version_info[0] >= 3: - from io import StringIO -else: - from io import StringIO class Reader(object): """A line-based string reader. diff --git a/doc/sphinxext/numpydoc/docscrape_sphinx.py b/doc/sphinxext/numpydoc/docscrape_sphinx.py index 1248253b3..d202bad34 100644 --- a/doc/sphinxext/numpydoc/docscrape_sphinx.py +++ b/doc/sphinxext/numpydoc/docscrape_sphinx.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re, inspect, textwrap, pydoc import sphinx diff --git a/doc/sphinxext/numpydoc/linkcode.py b/doc/sphinxext/numpydoc/linkcode.py index 986f39384..1ad3ab82c 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, absolute_import +from __future__ import division, absolute_import, print_function import warnings import collections diff --git a/doc/sphinxext/numpydoc/numpydoc.py b/doc/sphinxext/numpydoc/numpydoc.py index d95d476ef..773a87d37 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, absolute_import +from __future__ import division, absolute_import, print_function import sphinx import collections diff --git a/doc/sphinxext/numpydoc/phantom_import.py b/doc/sphinxext/numpydoc/phantom_import.py index 855068834..9a60b4a35 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, absolute_import +from __future__ import division, absolute_import, print_function 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 a7f4655ce..2014f8570 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, absolute_import +from __future__ import division, absolute_import, print_function 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 877d33980..60a9749ba 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, absolute_import +from __future__ import division, absolute_import, print_function import sys, textwrap diff --git a/doc/sphinxext/numpydoc/tests/test_linkcode.py b/doc/sphinxext/numpydoc/tests/test_linkcode.py index b0c863dd6..340166a48 100644 --- a/doc/sphinxext/numpydoc/tests/test_linkcode.py +++ b/doc/sphinxext/numpydoc/tests/test_linkcode.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.linkcode diff --git a/doc/sphinxext/numpydoc/tests/test_phantom_import.py b/doc/sphinxext/numpydoc/tests/test_phantom_import.py index 337db377a..173b5662b 100644 --- a/doc/sphinxext/numpydoc/tests/test_phantom_import.py +++ b/doc/sphinxext/numpydoc/tests/test_phantom_import.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.phantom_import diff --git a/doc/sphinxext/numpydoc/tests/test_plot_directive.py b/doc/sphinxext/numpydoc/tests/test_plot_directive.py index 738166424..0e511fcbc 100644 --- a/doc/sphinxext/numpydoc/tests/test_plot_directive.py +++ b/doc/sphinxext/numpydoc/tests/test_plot_directive.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.plot_directive diff --git a/doc/sphinxext/numpydoc/tests/test_traitsdoc.py b/doc/sphinxext/numpydoc/tests/test_traitsdoc.py index 882d6f796..d36e5ddbd 100644 --- a/doc/sphinxext/numpydoc/tests/test_traitsdoc.py +++ b/doc/sphinxext/numpydoc/tests/test_traitsdoc.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.traitsdoc diff --git a/doc/sphinxext/numpydoc/traitsdoc.py b/doc/sphinxext/numpydoc/traitsdoc.py index 74c226ab4..c5f0e7912 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, absolute_import +from __future__ import division, absolute_import, print_function import inspect import os diff --git a/doc/sphinxext/setup.py b/doc/sphinxext/setup.py index a6593aaa6..5b3454b3a 100644 --- a/doc/sphinxext/setup.py +++ b/doc/sphinxext/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import setuptools from distutils.core import setup diff --git a/doc/summarize.py b/doc/summarize.py index d72fcef61..a1f283be4 100755 --- a/doc/summarize.py +++ b/doc/summarize.py @@ -5,7 +5,7 @@ summarize.py Show a summary about which Numpy functions are documented and which are not. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os, glob, re, sys, inspect, optparse import collections @@ -78,22 +78,22 @@ def main(): for (filename, section, keyword, toctree) in locations: in_sections.setdefault((filename, section, keyword), []).append(name) - print "Documented" - print "==========\n" + print("Documented") + print("==========\n") last_filename = None for (filename, section, keyword), names in sorted(in_sections.items()): if filename != last_filename: - print "--- %s\n" % filename + print("--- %s\n" % filename) last_filename = filename - print " ** ", section - print format_in_columns(sorted(names), options.cols) - print "\n" - - print "" - print "Undocumented" - print "============\n" - print format_in_columns(sorted(undocumented.keys()), options.cols) + print(" ** ", section) + print(format_in_columns(sorted(names), options.cols)) + print("\n") + + print("") + print("Undocumented") + print("============\n") + print(format_in_columns(sorted(undocumented.keys()), options.cols)) def check_numpy(): documented = get_documented(glob.glob(SOURCE_DIR + '/*.rst')) diff --git a/doc/swig/test/setup.py b/doc/swig/test/setup.py index 6395ffe46..c54b42ed4 100755 --- a/doc/swig/test/setup.py +++ b/doc/swig/test/setup.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division +from __future__ import division, print_function # System imports from distutils.core import * diff --git a/doc/swig/test/testArray.py b/doc/swig/test/testArray.py index 433dfb1bd..de744ce37 100755 --- a/doc/swig/test/testArray.py +++ b/doc/swig/test/testArray.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -277,8 +277,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite(Array2TestCase)) # Execute the test suite - print "Testing Classes of Module Array" - print "NumPy version", np.__version__ - print + print("Testing Classes of Module Array") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/doc/swig/test/testFarray.py b/doc/swig/test/testFarray.py index c0699b07d..3905e26bd 100755 --- a/doc/swig/test/testFarray.py +++ b/doc/swig/test/testFarray.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -152,8 +152,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite(FarrayTestCase)) # Execute the test suite - print "Testing Classes of Module Farray" - print "NumPy version", np.__version__ - print + print("Testing Classes of Module Farray") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/doc/swig/test/testFortran.py b/doc/swig/test/testFortran.py index 499f6a439..ae7415d50 100644 --- a/doc/swig/test/testFortran.py +++ b/doc/swig/test/testFortran.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -27,14 +27,14 @@ class FortranTestCase(unittest.TestCase): # Test (type* IN_FARRAY2, int DIM1, int DIM2) typemap def testSecondElementContiguous(self): "Test luSplit function with a Fortran-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) second = Fortran.__dict__[self.typeStr + "SecondElement"] matrix = np.arange(9).reshape(3, 3).astype(self.typeCode) self.assertEquals(second(matrix), 3) def testSecondElementFortran(self): "Test luSplit function with a Fortran-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) second = Fortran.__dict__[self.typeStr + "SecondElement"] matrix = np.asfortranarray(np.arange(9).reshape(3, 3), self.typeCode) @@ -42,7 +42,7 @@ class FortranTestCase(unittest.TestCase): def testSecondElementObject(self): "Test luSplit function with a Fortran-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) second = Fortran.__dict__[self.typeStr + "SecondElement"] matrix = np.asfortranarray([[0,1,2],[3,4,5],[6,7,8]], self.typeCode) self.assertEquals(second(matrix), 3) @@ -163,8 +163,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite( doubleTestCase)) # Execute the test suite - print "Testing 2D Functions of Module Matrix" - print "NumPy version", np.__version__ - print + print("Testing 2D Functions of Module Matrix") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/doc/swig/test/testMatrix.py b/doc/swig/test/testMatrix.py index 187cd7214..d1721941e 100755 --- a/doc/swig/test/testMatrix.py +++ b/doc/swig/test/testMatrix.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -27,7 +27,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type IN_ARRAY2[ANY][ANY]) typemap def testDet(self): "Test det function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) det = Matrix.__dict__[self.typeStr + "Det"] matrix = [[8,7],[6,9]] self.assertEquals(det(matrix), 30) @@ -35,7 +35,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type IN_ARRAY2[ANY][ANY]) typemap def testDetBadList(self): "Test det function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) det = Matrix.__dict__[self.typeStr + "Det"] matrix = [[8,7], ["e", "pi"]] self.assertRaises(BadListError, det, matrix) @@ -43,7 +43,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type IN_ARRAY2[ANY][ANY]) typemap def testDetWrongDim(self): "Test det function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) det = Matrix.__dict__[self.typeStr + "Det"] matrix = [8,7] self.assertRaises(TypeError, det, matrix) @@ -51,7 +51,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type IN_ARRAY2[ANY][ANY]) typemap def testDetWrongSize(self): "Test det function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) det = Matrix.__dict__[self.typeStr + "Det"] matrix = [[8,7,6], [5,4,3], [2,1,0]] self.assertRaises(TypeError, det, matrix) @@ -59,14 +59,14 @@ class MatrixTestCase(unittest.TestCase): # Test (type IN_ARRAY2[ANY][ANY]) typemap def testDetNonContainer(self): "Test det function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) det = Matrix.__dict__[self.typeStr + "Det"] self.assertRaises(TypeError, det, None) # Test (type* IN_ARRAY2, int DIM1, int DIM2) typemap def testMax(self): "Test max function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Matrix.__dict__[self.typeStr + "Max"] matrix = [[6,5,4],[3,2,1]] self.assertEquals(max(matrix), 6) @@ -74,7 +74,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type* IN_ARRAY2, int DIM1, int DIM2) typemap def testMaxBadList(self): "Test max function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Matrix.__dict__[self.typeStr + "Max"] matrix = [[6,"five",4], ["three", 2, "one"]] self.assertRaises(BadListError, max, matrix) @@ -82,21 +82,21 @@ class MatrixTestCase(unittest.TestCase): # Test (type* IN_ARRAY2, int DIM1, int DIM2) typemap def testMaxNonContainer(self): "Test max function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Matrix.__dict__[self.typeStr + "Max"] self.assertRaises(TypeError, max, None) # Test (type* IN_ARRAY2, int DIM1, int DIM2) typemap def testMaxWrongDim(self): "Test max function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Matrix.__dict__[self.typeStr + "Max"] self.assertRaises(TypeError, max, [0, 1, 2, 3]) # Test (int DIM1, int DIM2, type* IN_ARRAY2) typemap def testMin(self): "Test min function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Matrix.__dict__[self.typeStr + "Min"] matrix = [[9,8],[7,6],[5,4]] self.assertEquals(min(matrix), 4) @@ -104,7 +104,7 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* IN_ARRAY2) typemap def testMinBadList(self): "Test min function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Matrix.__dict__[self.typeStr + "Min"] matrix = [["nine","eight"], ["seven","six"]] self.assertRaises(BadListError, min, matrix) @@ -112,21 +112,21 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* IN_ARRAY2) typemap def testMinWrongDim(self): "Test min function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Matrix.__dict__[self.typeStr + "Min"] self.assertRaises(TypeError, min, [1,3,5,7,9]) # Test (int DIM1, int DIM2, type* IN_ARRAY2) typemap def testMinNonContainer(self): "Test min function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Matrix.__dict__[self.typeStr + "Min"] self.assertRaises(TypeError, min, False) # Test (type INPLACE_ARRAY2[ANY][ANY]) typemap def testScale(self): "Test scale function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Matrix.__dict__[self.typeStr + "Scale"] matrix = np.array([[1,2,3],[2,1,2],[3,2,1]],self.typeCode) scale(matrix,4) @@ -135,7 +135,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY2[ANY][ANY]) typemap def testScaleWrongDim(self): "Test scale function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Matrix.__dict__[self.typeStr + "Scale"] matrix = np.array([1,2,2,1],self.typeCode) self.assertRaises(TypeError, scale, matrix) @@ -143,7 +143,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY2[ANY][ANY]) typemap def testScaleWrongSize(self): "Test scale function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Matrix.__dict__[self.typeStr + "Scale"] matrix = np.array([[1,2],[2,1]],self.typeCode) self.assertRaises(TypeError, scale, matrix) @@ -151,7 +151,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY2[ANY][ANY]) typemap def testScaleWrongType(self): "Test scale function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Matrix.__dict__[self.typeStr + "Scale"] matrix = np.array([[1,2,3],[2,1,2],[3,2,1]],'c') self.assertRaises(TypeError, scale, matrix) @@ -159,7 +159,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY2[ANY][ANY]) typemap def testScaleNonArray(self): "Test scale function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Matrix.__dict__[self.typeStr + "Scale"] matrix = [[1,2,3],[2,1,2],[3,2,1]] self.assertRaises(TypeError, scale, matrix) @@ -167,7 +167,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY2, int DIM1, int DIM2) typemap def testFloor(self): "Test floor function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Matrix.__dict__[self.typeStr + "Floor"] matrix = np.array([[6,7],[8,9]],self.typeCode) floor(matrix,7) @@ -176,7 +176,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY2, int DIM1, int DIM2) typemap def testFloorWrongDim(self): "Test floor function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Matrix.__dict__[self.typeStr + "Floor"] matrix = np.array([6,7,8,9],self.typeCode) self.assertRaises(TypeError, floor, matrix) @@ -184,7 +184,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY2, int DIM1, int DIM2) typemap def testFloorWrongType(self): "Test floor function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Matrix.__dict__[self.typeStr + "Floor"] matrix = np.array([[6,7], [8,9]],'c') self.assertRaises(TypeError, floor, matrix) @@ -192,7 +192,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY2, int DIM1, int DIM2) typemap def testFloorNonArray(self): "Test floor function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Matrix.__dict__[self.typeStr + "Floor"] matrix = [[6,7], [8,9]] self.assertRaises(TypeError, floor, matrix) @@ -200,7 +200,7 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* INPLACE_ARRAY2) typemap def testCeil(self): "Test ceil function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Matrix.__dict__[self.typeStr + "Ceil"] matrix = np.array([[1,2],[3,4]],self.typeCode) ceil(matrix,3) @@ -209,7 +209,7 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* INPLACE_ARRAY2) typemap def testCeilWrongDim(self): "Test ceil function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Matrix.__dict__[self.typeStr + "Ceil"] matrix = np.array([1,2,3,4],self.typeCode) self.assertRaises(TypeError, ceil, matrix) @@ -217,7 +217,7 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* INPLACE_ARRAY2) typemap def testCeilWrongType(self): "Test ceil function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Matrix.__dict__[self.typeStr + "Ceil"] matrix = np.array([[1,2], [3,4]],'c') self.assertRaises(TypeError, ceil, matrix) @@ -225,7 +225,7 @@ class MatrixTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, type* INPLACE_ARRAY2) typemap def testCeilNonArray(self): "Test ceil function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Matrix.__dict__[self.typeStr + "Ceil"] matrix = [[1,2], [3,4]] self.assertRaises(TypeError, ceil, matrix) @@ -233,7 +233,7 @@ class MatrixTestCase(unittest.TestCase): # Test (type ARGOUT_ARRAY2[ANY][ANY]) typemap def testLUSplit(self): "Test luSplit function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) luSplit = Matrix.__dict__[self.typeStr + "LUSplit"] lower, upper = luSplit([[1,2,3],[4,5,6],[7,8,9]]) self.assertEquals((lower == [[1,0,0],[4,5,0],[7,8,9]]).all(), True) @@ -355,8 +355,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite( doubleTestCase)) # Execute the test suite - print "Testing 2D Functions of Module Matrix" - print "NumPy version", np.__version__ - print + print("Testing 2D Functions of Module Matrix") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/doc/swig/test/testTensor.py b/doc/swig/test/testTensor.py index cd9cada46..b6dd2e98a 100755 --- a/doc/swig/test/testTensor.py +++ b/doc/swig/test/testTensor.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -29,7 +29,7 @@ class TensorTestCase(unittest.TestCase): # Test (type IN_ARRAY3[ANY][ANY][ANY]) typemap def testNorm(self): "Test norm function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) norm = Tensor.__dict__[self.typeStr + "Norm"] tensor = [[[0,1], [2,3]], [[3,2], [1,0]]] @@ -41,7 +41,7 @@ class TensorTestCase(unittest.TestCase): # Test (type IN_ARRAY3[ANY][ANY][ANY]) typemap def testNormBadList(self): "Test norm function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) norm = Tensor.__dict__[self.typeStr + "Norm"] tensor = [[[0,"one"],[2,3]], [[3,"two"],[1,0]]] @@ -50,7 +50,7 @@ class TensorTestCase(unittest.TestCase): # Test (type IN_ARRAY3[ANY][ANY][ANY]) typemap def testNormWrongDim(self): "Test norm function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) norm = Tensor.__dict__[self.typeStr + "Norm"] tensor = [[0,1,2,3], [3,2,1,0]] @@ -59,7 +59,7 @@ class TensorTestCase(unittest.TestCase): # Test (type IN_ARRAY3[ANY][ANY][ANY]) typemap def testNormWrongSize(self): "Test norm function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) norm = Tensor.__dict__[self.typeStr + "Norm"] tensor = [[[0,1,0], [2,3,2]], [[3,2,3], [1,0,1]]] @@ -68,14 +68,14 @@ class TensorTestCase(unittest.TestCase): # Test (type IN_ARRAY3[ANY][ANY][ANY]) typemap def testNormNonContainer(self): "Test norm function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) norm = Tensor.__dict__[self.typeStr + "Norm"] self.assertRaises(TypeError, norm, None) # Test (type* IN_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testMax(self): "Test max function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Tensor.__dict__[self.typeStr + "Max"] tensor = [[[1,2], [3,4]], [[5,6], [7,8]]] @@ -84,7 +84,7 @@ class TensorTestCase(unittest.TestCase): # Test (type* IN_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testMaxBadList(self): "Test max function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Tensor.__dict__[self.typeStr + "Max"] tensor = [[[1,"two"], [3,4]], [[5,"six"], [7,8]]] @@ -93,21 +93,21 @@ class TensorTestCase(unittest.TestCase): # Test (type* IN_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testMaxNonContainer(self): "Test max function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Tensor.__dict__[self.typeStr + "Max"] self.assertRaises(TypeError, max, None) # Test (type* IN_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testMaxWrongDim(self): "Test max function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) max = Tensor.__dict__[self.typeStr + "Max"] self.assertRaises(TypeError, max, [0, -1, 2, -3]) # Test (int DIM1, int DIM2, int DIM3, type* IN_ARRAY3) typemap def testMin(self): "Test min function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Tensor.__dict__[self.typeStr + "Min"] tensor = [[[9,8], [7,6]], [[5,4], [3,2]]] @@ -116,7 +116,7 @@ class TensorTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, int DIM3, type* IN_ARRAY3) typemap def testMinBadList(self): "Test min function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Tensor.__dict__[self.typeStr + "Min"] tensor = [[["nine",8], [7,6]], [["five",4], [3,2]]] @@ -125,21 +125,21 @@ class TensorTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, int DIM3, type* IN_ARRAY3) typemap def testMinNonContainer(self): "Test min function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Tensor.__dict__[self.typeStr + "Min"] self.assertRaises(TypeError, min, True) # Test (int DIM1, int DIM2, int DIM3, type* IN_ARRAY3) typemap def testMinWrongDim(self): "Test min function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) min = Tensor.__dict__[self.typeStr + "Min"] self.assertRaises(TypeError, min, [[1,3],[5,7]]) # Test (type INPLACE_ARRAY3[ANY][ANY][ANY]) typemap def testScale(self): "Test scale function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Tensor.__dict__[self.typeStr + "Scale"] tensor = np.array([[[1,0,1], [0,1,0], [1,0,1]], [[0,1,0], [1,0,1], [0,1,0]], @@ -152,7 +152,7 @@ class TensorTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY3[ANY][ANY][ANY]) typemap def testScaleWrongType(self): "Test scale function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Tensor.__dict__[self.typeStr + "Scale"] tensor = np.array([[[1,0,1], [0,1,0], [1,0,1]], [[0,1,0], [1,0,1], [0,1,0]], @@ -162,7 +162,7 @@ class TensorTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY3[ANY][ANY][ANY]) typemap def testScaleWrongDim(self): "Test scale function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Tensor.__dict__[self.typeStr + "Scale"] tensor = np.array([[1,0,1], [0,1,0], [1,0,1], [0,1,0], [1,0,1], [0,1,0]],self.typeCode) @@ -171,7 +171,7 @@ class TensorTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY3[ANY][ANY][ANY]) typemap def testScaleWrongSize(self): "Test scale function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Tensor.__dict__[self.typeStr + "Scale"] tensor = np.array([[[1,0], [0,1], [1,0]], [[0,1], [1,0], [0,1]], @@ -181,14 +181,14 @@ class TensorTestCase(unittest.TestCase): # Test (type INPLACE_ARRAY3[ANY][ANY][ANY]) typemap def testScaleNonArray(self): "Test scale function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) scale = Tensor.__dict__[self.typeStr + "Scale"] self.assertRaises(TypeError, scale, True) # Test (type* INPLACE_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testFloor(self): "Test floor function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Tensor.__dict__[self.typeStr + "Floor"] tensor = np.array([[[1,2], [3,4]], [[5,6], [7,8]]],self.typeCode) @@ -199,7 +199,7 @@ class TensorTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testFloorWrongType(self): "Test floor function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Tensor.__dict__[self.typeStr + "Floor"] tensor = np.array([[[1,2], [3,4]], [[5,6], [7,8]]],'c') @@ -208,7 +208,7 @@ class TensorTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testFloorWrongDim(self): "Test floor function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Tensor.__dict__[self.typeStr + "Floor"] tensor = np.array([[1,2], [3,4], [5,6], [7,8]],self.typeCode) self.assertRaises(TypeError, floor, tensor) @@ -216,14 +216,14 @@ class TensorTestCase(unittest.TestCase): # Test (type* INPLACE_ARRAY3, int DIM1, int DIM2, int DIM3) typemap def testFloorNonArray(self): "Test floor function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) floor = Tensor.__dict__[self.typeStr + "Floor"] self.assertRaises(TypeError, floor, object) # Test (int DIM1, int DIM2, int DIM3, type* INPLACE_ARRAY3) typemap def testCeil(self): "Test ceil function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Tensor.__dict__[self.typeStr + "Ceil"] tensor = np.array([[[9,8], [7,6]], [[5,4], [3,2]]],self.typeCode) @@ -234,7 +234,7 @@ class TensorTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, int DIM3, type* INPLACE_ARRAY3) typemap def testCeilWrongType(self): "Test ceil function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Tensor.__dict__[self.typeStr + "Ceil"] tensor = np.array([[[9,8], [7,6]], [[5,4], [3,2]]],'c') @@ -243,7 +243,7 @@ class TensorTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, int DIM3, type* INPLACE_ARRAY3) typemap def testCeilWrongDim(self): "Test ceil function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Tensor.__dict__[self.typeStr + "Ceil"] tensor = np.array([[9,8], [7,6], [5,4], [3,2]], self.typeCode) self.assertRaises(TypeError, ceil, tensor) @@ -251,7 +251,7 @@ class TensorTestCase(unittest.TestCase): # Test (int DIM1, int DIM2, int DIM3, type* INPLACE_ARRAY3) typemap def testCeilNonArray(self): "Test ceil function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ceil = Tensor.__dict__[self.typeStr + "Ceil"] tensor = [[[9,8], [7,6]], [[5,4], [3,2]]] @@ -260,7 +260,7 @@ class TensorTestCase(unittest.TestCase): # Test (type ARGOUT_ARRAY3[ANY][ANY][ANY]) typemap def testLUSplit(self): "Test luSplit function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) luSplit = Tensor.__dict__[self.typeStr + "LUSplit"] lower, upper = luSplit([[[1,1], [1,1]], [[1,1], [1,1]]]) @@ -395,8 +395,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite( doubleTestCase)) # Execute the test suite - print "Testing 3D Functions of Module Tensor" - print "NumPy version", np.__version__ - print + print("Testing 3D Functions of Module Tensor") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/doc/swig/test/testVector.py b/doc/swig/test/testVector.py index 29a77d281..d644e464c 100755 --- a/doc/swig/test/testVector.py +++ b/doc/swig/test/testVector.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # System imports from distutils.util import get_platform @@ -27,98 +27,98 @@ class VectorTestCase(unittest.TestCase): # Test the (type IN_ARRAY1[ANY]) typemap def testLength(self): "Test length function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) length = Vector.__dict__[self.typeStr + "Length"] self.assertEquals(length([5, 12, 0]), 13) # Test the (type IN_ARRAY1[ANY]) typemap def testLengthBadList(self): "Test length function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) length = Vector.__dict__[self.typeStr + "Length"] self.assertRaises(BadListError, length, [5, "twelve", 0]) # Test the (type IN_ARRAY1[ANY]) typemap def testLengthWrongSize(self): "Test length function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) length = Vector.__dict__[self.typeStr + "Length"] self.assertRaises(TypeError, length, [5, 12]) # Test the (type IN_ARRAY1[ANY]) typemap def testLengthWrongDim(self): "Test length function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) length = Vector.__dict__[self.typeStr + "Length"] self.assertRaises(TypeError, length, [[1,2], [3,4]]) # Test the (type IN_ARRAY1[ANY]) typemap def testLengthNonContainer(self): "Test length function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) length = Vector.__dict__[self.typeStr + "Length"] self.assertRaises(TypeError, length, None) # Test the (type* IN_ARRAY1, int DIM1) typemap def testProd(self): "Test prod function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) prod = Vector.__dict__[self.typeStr + "Prod"] self.assertEquals(prod([1,2,3,4]), 24) # Test the (type* IN_ARRAY1, int DIM1) typemap def testProdBadList(self): "Test prod function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) prod = Vector.__dict__[self.typeStr + "Prod"] self.assertRaises(BadListError, prod, [[1,"two"], ["e","pi"]]) # Test the (type* IN_ARRAY1, int DIM1) typemap def testProdWrongDim(self): "Test prod function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) prod = Vector.__dict__[self.typeStr + "Prod"] self.assertRaises(TypeError, prod, [[1,2], [8,9]]) # Test the (type* IN_ARRAY1, int DIM1) typemap def testProdNonContainer(self): "Test prod function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) prod = Vector.__dict__[self.typeStr + "Prod"] self.assertRaises(TypeError, prod, None) # Test the (int DIM1, type* IN_ARRAY1) typemap def testSum(self): "Test sum function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) sum = Vector.__dict__[self.typeStr + "Sum"] self.assertEquals(sum([5,6,7,8]), 26) # Test the (int DIM1, type* IN_ARRAY1) typemap def testSumBadList(self): "Test sum function with bad list" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) sum = Vector.__dict__[self.typeStr + "Sum"] self.assertRaises(BadListError, sum, [3,4, 5, "pi"]) # Test the (int DIM1, type* IN_ARRAY1) typemap def testSumWrongDim(self): "Test sum function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) sum = Vector.__dict__[self.typeStr + "Sum"] self.assertRaises(TypeError, sum, [[3,4], [5,6]]) # Test the (int DIM1, type* IN_ARRAY1) typemap def testSumNonContainer(self): "Test sum function with non-container" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) sum = Vector.__dict__[self.typeStr + "Sum"] self.assertRaises(TypeError, sum, True) # Test the (type INPLACE_ARRAY1[ANY]) typemap def testReverse(self): "Test reverse function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) reverse = Vector.__dict__[self.typeStr + "Reverse"] vector = np.array([1,2,4],self.typeCode) reverse(vector) @@ -127,7 +127,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type INPLACE_ARRAY1[ANY]) typemap def testReverseWrongDim(self): "Test reverse function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) reverse = Vector.__dict__[self.typeStr + "Reverse"] vector = np.array([[1,2], [3,4]],self.typeCode) self.assertRaises(TypeError, reverse, vector) @@ -135,7 +135,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type INPLACE_ARRAY1[ANY]) typemap def testReverseWrongSize(self): "Test reverse function with wrong size" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) reverse = Vector.__dict__[self.typeStr + "Reverse"] vector = np.array([9,8,7,6,5,4],self.typeCode) self.assertRaises(TypeError, reverse, vector) @@ -143,7 +143,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type INPLACE_ARRAY1[ANY]) typemap def testReverseWrongType(self): "Test reverse function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) reverse = Vector.__dict__[self.typeStr + "Reverse"] vector = np.array([1,2,4],'c') self.assertRaises(TypeError, reverse, vector) @@ -151,14 +151,14 @@ class VectorTestCase(unittest.TestCase): # Test the (type INPLACE_ARRAY1[ANY]) typemap def testReverseNonArray(self): "Test reverse function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) reverse = Vector.__dict__[self.typeStr + "Reverse"] self.assertRaises(TypeError, reverse, [2,4,6]) # Test the (type* INPLACE_ARRAY1, int DIM1) typemap def testOnes(self): "Test ones function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ones = Vector.__dict__[self.typeStr + "Ones"] vector = np.zeros(5,self.typeCode) ones(vector) @@ -167,7 +167,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type* INPLACE_ARRAY1, int DIM1) typemap def testOnesWrongDim(self): "Test ones function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ones = Vector.__dict__[self.typeStr + "Ones"] vector = np.zeros((5,5),self.typeCode) self.assertRaises(TypeError, ones, vector) @@ -175,7 +175,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type* INPLACE_ARRAY1, int DIM1) typemap def testOnesWrongType(self): "Test ones function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ones = Vector.__dict__[self.typeStr + "Ones"] vector = np.zeros((5,5),'c') self.assertRaises(TypeError, ones, vector) @@ -183,14 +183,14 @@ class VectorTestCase(unittest.TestCase): # Test the (type* INPLACE_ARRAY1, int DIM1) typemap def testOnesNonArray(self): "Test ones function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) ones = Vector.__dict__[self.typeStr + "Ones"] self.assertRaises(TypeError, ones, [2,4,6,8]) # Test the (int DIM1, type* INPLACE_ARRAY1) typemap def testZeros(self): "Test zeros function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) zeros = Vector.__dict__[self.typeStr + "Zeros"] vector = np.ones(5,self.typeCode) zeros(vector) @@ -199,7 +199,7 @@ class VectorTestCase(unittest.TestCase): # Test the (int DIM1, type* INPLACE_ARRAY1) typemap def testZerosWrongDim(self): "Test zeros function with wrong dimensions" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) zeros = Vector.__dict__[self.typeStr + "Zeros"] vector = np.ones((5,5),self.typeCode) self.assertRaises(TypeError, zeros, vector) @@ -207,7 +207,7 @@ class VectorTestCase(unittest.TestCase): # Test the (int DIM1, type* INPLACE_ARRAY1) typemap def testZerosWrongType(self): "Test zeros function with wrong type" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) zeros = Vector.__dict__[self.typeStr + "Zeros"] vector = np.ones(6,'c') self.assertRaises(TypeError, zeros, vector) @@ -215,14 +215,14 @@ class VectorTestCase(unittest.TestCase): # Test the (int DIM1, type* INPLACE_ARRAY1) typemap def testZerosNonArray(self): "Test zeros function with non-array" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) zeros = Vector.__dict__[self.typeStr + "Zeros"] self.assertRaises(TypeError, zeros, [1,3,5,7,9]) # Test the (type ARGOUT_ARRAY1[ANY]) typemap def testEOSplit(self): "Test eoSplit function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) eoSplit = Vector.__dict__[self.typeStr + "EOSplit"] even, odd = eoSplit([1,2,3]) self.assertEquals((even == [1,0,3]).all(), True) @@ -231,7 +231,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type* ARGOUT_ARRAY1, int DIM1) typemap def testTwos(self): "Test twos function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) twos = Vector.__dict__[self.typeStr + "Twos"] vector = twos(5) self.assertEquals((vector == [2,2,2,2,2]).all(), True) @@ -239,14 +239,14 @@ class VectorTestCase(unittest.TestCase): # Test the (type* ARGOUT_ARRAY1, int DIM1) typemap def testTwosNonInt(self): "Test twos function with non-integer dimension" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) twos = Vector.__dict__[self.typeStr + "Twos"] self.assertRaises(TypeError, twos, 5.0) # Test the (int DIM1, type* ARGOUT_ARRAY1) typemap def testThrees(self): "Test threes function" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) threes = Vector.__dict__[self.typeStr + "Threes"] vector = threes(6) self.assertEquals((vector == [3,3,3,3,3,3]).all(), True) @@ -254,7 +254,7 @@ class VectorTestCase(unittest.TestCase): # Test the (type* ARGOUT_ARRAY1, int DIM1) typemap def testThreesNonInt(self): "Test threes function with non-integer dimension" - print >>sys.stderr, self.typeStr, "... ", + print(self.typeStr, "... ", end=' ', file=sys.stderr) threes = Vector.__dict__[self.typeStr + "Threes"] self.assertRaises(TypeError, threes, "threes") @@ -374,8 +374,8 @@ if __name__ == "__main__": suite.addTest(unittest.makeSuite( doubleTestCase)) # Execute the test suite - print "Testing 1D Functions of Module Vector" - print "NumPy version", np.__version__ - print + print("Testing 1D Functions of Module Vector") + print("NumPy version", np.__version__) + print() result = unittest.TextTestRunner(verbosity=2).run(suite) sys.exit(len(result.errors) + len(result.failures)) diff --git a/numpy/__init__.py b/numpy/__init__.py index f8c1de5ce..871a10afb 100644 --- a/numpy/__init__.py +++ b/numpy/__init__.py @@ -104,7 +104,7 @@ available as array methods, i.e. ``x = np.array([1,2,3]); x.sort()``. Exceptions to this rule are documented. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/_import_tools.py b/numpy/_import_tools.py index b5939cd0a..9ff9427d0 100644 --- a/numpy/_import_tools.py +++ b/numpy/_import_tools.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -262,13 +262,13 @@ class PackageLoader(object): def log(self,mess): if self.verbose>1: - print >> sys.stderr, str(mess) + print(str(mess), file=sys.stderr) def warn(self,mess): if self.verbose>=0: - print >> sys.stderr, str(mess) + print(str(mess), file=sys.stderr) def error(self,mess): if self.verbose!=-1: - print >> sys.stderr, str(mess) + print(str(mess), file=sys.stderr) def _get_doc_title(self, info_module): """ Get the title from a package info.py file. @@ -337,10 +337,10 @@ class PackageLoaderDebug(PackageLoader): def _execcmd(self,cmdstr): """ Execute command in parent_frame.""" frame = self.parent_frame - print 'Executing',`cmdstr`,'...', + print('Executing',`cmdstr`,'...', end=' ') sys.stdout.flush() exec (cmdstr, frame.f_globals,frame.f_locals) - print 'ok' + print('ok') sys.stdout.flush() return diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index a534e852c..24d4c2134 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -8,7 +8,7 @@ NOTE: Many of the methods of ndarray have corresponding functions. core/fromnumeric.py, core/defmatrix.py up-to-date. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.lib import add_newdoc diff --git a/numpy/build_utils/__init__.py b/numpy/build_utils/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/build_utils/__init__.py +++ b/numpy/build_utils/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/build_utils/common.py b/numpy/build_utils/common.py index 50d2f59bc..3592076a1 100644 --- a/numpy/build_utils/common.py +++ b/numpy/build_utils/common.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import copy diff --git a/numpy/build_utils/waf.py b/numpy/build_utils/waf.py index 09f1943ea..263640d9e 100644 --- a/numpy/build_utils/waf.py +++ b/numpy/build_utils/waf.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re diff --git a/numpy/compat/__init__.py b/numpy/compat/__init__.py index bb40fdbe9..5b371f5c0 100644 --- a/numpy/compat/__init__.py +++ b/numpy/compat/__init__.py @@ -8,7 +8,7 @@ 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, absolute_import +from __future__ import division, absolute_import, print_function from . import _inspect from . import py3k diff --git a/numpy/compat/_inspect.py b/numpy/compat/_inspect.py index 902d609a9..931364f6d 100644 --- a/numpy/compat/_inspect.py +++ b/numpy/compat/_inspect.py @@ -5,7 +5,7 @@ significanly contributes to numpy import times. Importing this copy has almost no overhead. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import types @@ -211,11 +211,11 @@ if __name__ == '__main__': def foo(x, y, z=None): return None - print inspect.getargs(foo.__code__) - print getargs(foo.__code__) + print(inspect.getargs(foo.__code__)) + print(getargs(foo.__code__)) - print inspect.getargspec(foo) - print getargspec(foo) + print(inspect.getargspec(foo)) + print(getargspec(foo)) - print inspect.formatargspec(*inspect.getargspec(foo)) - print formatargspec(*getargspec(foo)) + print(inspect.formatargspec(*inspect.getargspec(foo))) + print(formatargspec(*getargspec(foo))) diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py index 7d853d84b..4a7866a56 100644 --- a/numpy/compat/py3k.py +++ b/numpy/compat/py3k.py @@ -2,7 +2,7 @@ Python 3 compatibility tools. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __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 3de064650..ce0ad8c72 100644 --- a/numpy/compat/setup.py +++ b/numpy/compat/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py index d2f7c3c8c..50af6e548 100644 --- a/numpy/core/__init__.py +++ b/numpy/core/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .info import __doc__ from numpy.version import version as __version__ diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index ae7a81ca8..5115975c2 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -4,7 +4,7 @@ A place for code to be called from core C-code. Some things are more easily handled Python. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import sys diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py index 358d35ef1..66a05e868 100644 --- a/numpy/core/_methods.py +++ b/numpy/core/_methods.py @@ -3,7 +3,7 @@ Array methods which are called by the both the C-code for the method and the Python code for the NumPy-namespace function """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.core import multiarray as mu from numpy.core import umath as um diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index 6e53dca00..89ddef269 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -3,7 +3,7 @@ $Id: arrayprint.py,v 1.9 2005/09/13 13:58:44 teoliphant Exp $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ["array2string", "set_printoptions", "get_printoptions"] __docformat__ = 'restructuredtext' diff --git a/numpy/core/code_generators/__init__.py b/numpy/core/code_generators/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/core/code_generators/__init__.py +++ b/numpy/core/code_generators/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/core/code_generators/cversions.py b/numpy/core/code_generators/cversions.py index 9f8a8fb34..5ce0757c8 100644 --- a/numpy/core/code_generators/cversions.py +++ b/numpy/core/code_generators/cversions.py @@ -3,7 +3,7 @@ The API has is defined by numpy_api_order and ufunc_api_order. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from os.path import dirname @@ -13,4 +13,4 @@ from . import numpy_api if __name__ == '__main__': curdir = dirname(__file__) - print fullapi_hash(numpy_api.full_api) + print(fullapi_hash(numpy_api.full_api)) diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py index 3855d5a3d..2f188af17 100644 --- a/numpy/core/code_generators/genapi.py +++ b/numpy/core/code_generators/genapi.py @@ -6,7 +6,7 @@ See ``find_function`` for how functions should be formatted, and specified. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, os, re try: @@ -254,7 +254,7 @@ def find_functions(filename, tag='API'): else: function_args.append(line) except: - print(filename, lineno+1) + print(filename, lineno + 1) raise fo.close() return functions @@ -483,8 +483,8 @@ def main(): print(func) ah = func.api_hash() m.update(ah) - print(hex(int(ah,16))) - print(hex(int(m.hexdigest()[:8],16))) + print(hex(int(ah, 16))) + print(hex(int(m.hexdigest()[:8], 16))) if __name__ == '__main__': main() diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py index 6a9fde238..ce270a6a0 100644 --- a/numpy/core/code_generators/generate_numpy_api.py +++ b/numpy/core/code_generators/generate_numpy_api.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import os import genapi diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py index 862d46e34..6305385af 100644 --- a/numpy/core/code_generators/generate_ufunc_api.py +++ b/numpy/core/code_generators/generate_ufunc_api.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import os import genapi diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py index ebbf63f20..549431306 100644 --- a/numpy/core/code_generators/generate_umath.py +++ b/numpy/core/code_generators/generate_umath.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import os import re diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py index 35c8ab496..07a87f98d 100644 --- a/numpy/core/code_generators/numpy_api.py +++ b/numpy/core/code_generators/numpy_api.py @@ -12,7 +12,7 @@ When adding a function, make sure to use the next integer not used as an index exception, so it should hopefully not get unnoticed). """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function multiarray_global_vars = { 'NPY_NUMUSERTYPES': 7, diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py index b990e81ea..5bb5f3f00 100644 --- a/numpy/core/code_generators/ufunc_docstrings.py +++ b/numpy/core/code_generators/ufunc_docstrings.py @@ -9,7 +9,7 @@ for the ufuncs in numpy.core at the C level when the ufuncs are created at compile time. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function docdict = {} diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py index 3f0a730ad..d5acb1e97 100644 --- a/numpy/core/defchararray.py +++ b/numpy/core/defchararray.py @@ -15,7 +15,7 @@ available in your version of Python. The preferred alias for `defchararray` is `numpy.char`. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from .numerictypes import string_, unicode_, integer, object_, bool_, character diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index e7211cede..a301bb7e9 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1,7 +1,7 @@ """Module containing non-deprecated functions borrowed from Numeric. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __docformat__ = "restructuredtext en" diff --git a/numpy/core/function_base.py b/numpy/core/function_base.py index 4a757b931..686425623 100644 --- a/numpy/core/function_base.py +++ b/numpy/core/function_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['logspace', 'linspace'] diff --git a/numpy/core/getlimits.py b/numpy/core/getlimits.py index 606038677..57ad60543 100644 --- a/numpy/core/getlimits.py +++ b/numpy/core/getlimits.py @@ -1,7 +1,7 @@ """Machine limits for Float32 and Float64 and (long double) if available... """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['finfo','iinfo'] @@ -296,11 +296,11 @@ max = %(max)s if __name__ == '__main__': f = finfo(ntypes.single) - print 'single epsilon:',f.eps - print 'single tiny:',f.tiny + print('single epsilon:',f.eps) + print('single tiny:',f.tiny) f = finfo(ntypes.float) - print 'float epsilon:',f.eps - print 'float tiny:',f.tiny + print('float epsilon:',f.eps) + print('float tiny:',f.tiny) f = finfo(ntypes.longfloat) - print 'longfloat epsilon:',f.eps - print 'longfloat tiny:',f.tiny + print('longfloat epsilon:',f.eps) + print('longfloat tiny:',f.tiny) diff --git a/numpy/core/info.py b/numpy/core/info.py index 7152e4aca..241f209b5 100644 --- a/numpy/core/info.py +++ b/numpy/core/info.py @@ -81,7 +81,7 @@ More Functions: arccosh arcsinh arctanh """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function depends = ['testing'] global_symbols = ['*'] diff --git a/numpy/core/machar.py b/numpy/core/machar.py index 1053570f8..85eb6b625 100644 --- a/numpy/core/machar.py +++ b/numpy/core/machar.py @@ -5,7 +5,7 @@ floating-point arithmetic system Author: Pearu Peterson, September 2003 """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['MachAr'] @@ -338,4 +338,4 @@ maxexp=%(maxexp)s xmax=%(_str_xmax)s ((1-epsneg)*beta**maxexp == huge) if __name__ == '__main__': - print MachAr() + print(MachAr()) diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py index 528951537..daa4d751a 100644 --- a/numpy/core/memmap.py +++ b/numpy/core/memmap.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['memmap'] diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 5f4504eb9..f1cdb0409 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import warnings diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index 8bf0cc880..a7ca5f8f7 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -80,7 +80,7 @@ Exported symbols include: \\-> object_ (not used much) (kind=O) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # we add more at the bottom __all__ = ['sctypeDict', 'sctypeNA', 'typeDict', 'typeNA', 'sctypes', diff --git a/numpy/core/records.py b/numpy/core/records.py index 7a9481b38..bcc9c73dc 100644 --- a/numpy/core/records.py +++ b/numpy/core/records.py @@ -34,7 +34,7 @@ Record arrays allow us to access fields as properties:: array([ 2., 2.]) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # All of the functions allow formats to be a dtype __all__ = ['record', 'recarray', 'format_parser'] diff --git a/numpy/core/setup.py b/numpy/core/setup.py index ea20b11d2..4e4630eb0 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import imp import os @@ -105,7 +105,7 @@ def win32_checks(deflist): a = get_build_architecture() # Distutils hack on AMD64 on windows - print('BUILD_ARCHITECTURE: %r, os.name=%r, sys.platform=%r' % \ + print('BUILD_ARCHITECTURE: %r, os.name=%r, sys.platform=%r' % (a, os.name, sys.platform)) if a == 'AMD64': deflist.append('DISTUTILS_USE_SDK') diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 53f3b76e1..3f705cbe4 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # Code common to build tools import sys diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index d7e86f64e..9f146ad5c 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack'] diff --git a/numpy/core/src/multiarray/testcalcs.py b/numpy/core/src/multiarray/testcalcs.py index d4b39cb4a..9182ae2c3 100644 --- a/numpy/core/src/multiarray/testcalcs.py +++ b/numpy/core/src/multiarray/testcalcs.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from scipy import weave diff --git a/numpy/core/tests/test_api.py b/numpy/core/tests/test_api.py index d93d6477a..1d4b93b0f 100644 --- a/numpy/core/tests/test_api.py +++ b/numpy/core/tests/test_api.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py index e286aea07..3c024d934 100644 --- a/numpy/core/tests/test_arrayprint.py +++ b/numpy/core/tests/test_arrayprint.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import numpy as np diff --git a/numpy/core/tests/test_blasdot.py b/numpy/core/tests/test_blasdot.py index 1dd56fddd..21f65b377 100644 --- a/numpy/core/tests/test_blasdot.py +++ b/numpy/core/tests/test_blasdot.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import sys diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py index eecbfe75b..4ba0c048a 100644 --- a/numpy/core/tests/test_datetime.py +++ b/numpy/core/tests/test_datetime.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os, pickle import numpy diff --git a/numpy/core/tests/test_defchararray.py b/numpy/core/tests/test_defchararray.py index d75955075..be8abb526 100644 --- a/numpy/core/tests/test_defchararray.py +++ b/numpy/core/tests/test_defchararray.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy.core import * diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index 6a248b5cf..5661deb02 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -3,7 +3,7 @@ Tests related to deprecation warnings. Also a convenient place to document how deprecations should eventually be turned into errors. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import warnings diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py index 804c1cf2c..21af2e82c 100644 --- a/numpy/core/tests/test_dtype.py +++ b/numpy/core/tests/test_dtype.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import numpy as np diff --git a/numpy/core/tests/test_einsum.py b/numpy/core/tests/test_einsum.py index aa0328a8b..dd5e9b85d 100644 --- a/numpy/core/tests/test_einsum.py +++ b/numpy/core/tests/test_einsum.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from decimal import Decimal diff --git a/numpy/core/tests/test_errstate.py b/numpy/core/tests/test_errstate.py index 04acafbc9..7eb0aba2e 100644 --- a/numpy/core/tests/test_errstate.py +++ b/numpy/core/tests/test_errstate.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import platform diff --git a/numpy/core/tests/test_function_base.py b/numpy/core/tests/test_function_base.py index 345e326c2..5de733d4c 100644 --- a/numpy/core/tests/test_function_base.py +++ b/numpy/core/tests/test_function_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import logspace, linspace diff --git a/numpy/core/tests/test_getlimits.py b/numpy/core/tests/test_getlimits.py index 794d9d0b7..a07793658 100644 --- a/numpy/core/tests/test_getlimits.py +++ b/numpy/core/tests/test_getlimits.py @@ -1,7 +1,7 @@ """ Test functions for limits module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/core/tests/test_half.py b/numpy/core/tests/test_half.py index a6a3cd05c..223a6f551 100644 --- a/numpy/core/tests/test_half.py +++ b/numpy/core/tests/test_half.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import platform diff --git a/numpy/core/tests/test_indexerrors.py b/numpy/core/tests/test_indexerrors.py index 5ab9b5aef..263c505de 100644 --- a/numpy/core/tests/test_indexerrors.py +++ b/numpy/core/tests/test_indexerrors.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import TestCase, run_module_suite, assert_raises, assert_equal, assert_ diff --git a/numpy/core/tests/test_indexing.py b/numpy/core/tests/test_indexing.py index 530fd5583..1a23da3c5 100644 --- a/numpy/core/tests/test_indexing.py +++ b/numpy/core/tests/test_indexing.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.compat import asbytes diff --git a/numpy/core/tests/test_item_selection.py b/numpy/core/tests/test_item_selection.py index d2282e52a..425b1d893 100644 --- a/numpy/core/tests/test_item_selection.py +++ b/numpy/core/tests/test_item_selection.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import * diff --git a/numpy/core/tests/test_machar.py b/numpy/core/tests/test_machar.py index 659902d84..120d51339 100644 --- a/numpy/core/tests/test_machar.py +++ b/numpy/core/tests/test_machar.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py index 01c804933..d16a3b4d2 100644 --- a/numpy/core/tests/test_memmap.py +++ b/numpy/core/tests/test_memmap.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from tempfile import NamedTemporaryFile, mktemp diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index bca255f21..fc58f6e9c 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import tempfile import sys diff --git a/numpy/core/tests/test_multiarray_assignment.py b/numpy/core/tests/test_multiarray_assignment.py index c47979b4d..65a09086b 100644 --- a/numpy/core/tests/test_multiarray_assignment.py +++ b/numpy/core/tests/test_multiarray_assignment.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import TestCase diff --git a/numpy/core/tests/test_nditer.py b/numpy/core/tests/test_nditer.py index 39b0c13ec..d27920229 100644 --- a/numpy/core/tests/test_nditer.py +++ b/numpy/core/tests/test_nditer.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy import array, arange, nditer, all diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py index f5953955b..9947a4660 100644 --- a/numpy/core/tests/test_numeric.py +++ b/numpy/core/tests/test_numeric.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import platform diff --git a/numpy/core/tests/test_numerictypes.py b/numpy/core/tests/test_numerictypes.py index 77fe2daf2..173ebbf9c 100644 --- a/numpy/core/tests/test_numerictypes.py +++ b/numpy/core/tests/test_numerictypes.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/core/tests/test_print.py b/numpy/core/tests/test_print.py index e2469ec7b..c31771ad7 100644 --- a/numpy/core/tests/test_print.py +++ b/numpy/core/tests/test_print.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import * @@ -145,12 +145,12 @@ def _test_redirected_print(x, tp, ref=None): stdout = sys.stdout try: sys.stdout = file_tp - print tp(x) + print(tp(x)) sys.stdout = file if ref: - print ref + print(ref) else: - print x + print(x) finally: sys.stdout = stdout diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py index fa5877538..753dec13e 100644 --- a/numpy/core/tests/test_records.py +++ b/numpy/core/tests/test_records.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from os import path import numpy as np diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py index 8d3b35bb9..09a035a42 100644 --- a/numpy/core/tests/test_regression.py +++ b/numpy/core/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import pickle import sys diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py index 75137411c..683aae8b2 100644 --- a/numpy/core/tests/test_scalarmath.py +++ b/numpy/core/tests/test_scalarmath.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/core/tests/test_scalarprint.py b/numpy/core/tests/test_scalarprint.py index 80f5ab622..8d0f27182 100644 --- a/numpy/core/tests/test_scalarprint.py +++ b/numpy/core/tests/test_scalarprint.py @@ -2,7 +2,7 @@ """ Test printing of scalar types. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import TestCase, assert_, run_module_suite diff --git a/numpy/core/tests/test_shape_base.py b/numpy/core/tests/test_shape_base.py index cc2ff9d17..803e740a0 100644 --- a/numpy/core/tests/test_shape_base.py +++ b/numpy/core/tests/test_shape_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings import numpy as np diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index 16ae9f50c..82f52d777 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py index cbad84bfc..173707351 100644 --- a/numpy/core/tests/test_umath.py +++ b/numpy/core/tests/test_umath.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import platform diff --git a/numpy/core/tests/test_umath_complex.py b/numpy/core/tests/test_umath_complex.py index a1368bccd..f9681ff07 100644 --- a/numpy/core/tests/test_umath_complex.py +++ b/numpy/core/tests/test_umath_complex.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import platform diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py index 17a3c386b..c1ea4b06e 100644 --- a/numpy/core/tests/test_unicode.py +++ b/numpy/core/tests/test_unicode.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/ctypeslib.py b/numpy/ctypeslib.py index aa49de34b..4e00b1cbc 100644 --- a/numpy/ctypeslib.py +++ b/numpy/ctypeslib.py @@ -49,7 +49,7 @@ Then, we're ready to call ``foo_func``: >>> _lib.foo_func(out, len(out)) #doctest: +SKIP """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['load_library', 'ndpointer', 'test', 'ctypes_load_library', 'c_intp', 'as_ctypes', 'as_array'] diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index 2a99ef8ad..b43e08b05 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/__version__.py b/numpy/distutils/__version__.py index e1bc8d30f..969decbba 100644 --- a/numpy/distutils/__version__.py +++ b/numpy/distutils/__version__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function major = 0 minor = 4 diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 247eead42..7efdf940a 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import os diff --git a/numpy/distutils/command/__init__.py b/numpy/distutils/command/__init__.py index 4c4ddbf1f..94a7185bb 100644 --- a/numpy/distutils/command/__init__.py +++ b/numpy/distutils/command/__init__.py @@ -4,7 +4,7 @@ Package containing implementation of all the standard Distutils commands. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function def test_na_writable_attributes_deletion(): a = np.NA(2) diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py index 3d71bb68e..8e70b4552 100644 --- a/numpy/distutils/command/autodist.py +++ b/numpy/distutils/command/autodist.py @@ -1,7 +1,7 @@ """This module implements additional tests ala autoconf which can be useful. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # 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 004f67b9d..e24072ff4 100644 --- a/numpy/distutils/command/bdist_rpm.py +++ b/numpy/distutils/command/bdist_rpm.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index f0755373b..0577738bf 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 87005e05f..8b150d800 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -1,6 +1,6 @@ """ Modified version of build_clib that handles fortran source files. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from glob import glob diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index d1092a85b..48e578b66 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -1,7 +1,7 @@ """ Modified version of build_ext that handles fortran source files. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py index 655e56b87..a74fbad07 100644 --- a/numpy/distutils/command/build_py.py +++ b/numpy/distutils/command/build_py.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 17cc6aaed..c8b25fc71 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -1,7 +1,7 @@ """ Modified version of build_scripts that handles building scripts from functions. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 d9a9023b0..2a33e5175 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -1,6 +1,6 @@ """ Build swig, f2py, pyrex sources. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 470ca07c9..fd8a135fb 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -2,7 +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, absolute_import +from __future__ import division, absolute_import, print_function import os, signal import warnings diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py index 3303d3469..bf776dd02 100644 --- a/numpy/distutils/command/config_compiler.py +++ b/numpy/distutils/command/config_compiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 17661e0bd..1410ab2a0 100644 --- a/numpy/distutils/command/develop.py +++ b/numpy/distutils/command/develop.py @@ -3,7 +3,7 @@ generated files (from build_src or build_scripts) are properly converted to real files with filenames. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 3a908f602..b7104de5b 100644 --- a/numpy/distutils/command/egg_info.py +++ b/numpy/distutils/command/egg_info.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from setuptools.command.egg_info import egg_info as _egg_info diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py index 37523c8e4..9dd8dede9 100644 --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys if 'setuptools' in sys.modules: diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py index 7753020e5..662aa00bd 100644 --- a/numpy/distutils/command/install_clib.py +++ b/numpy/distutils/command/install_clib.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from distutils.core import Command diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py index afdc98013..996cf7e40 100644 --- a/numpy/distutils/command/install_data.py +++ b/numpy/distutils/command/install_data.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 c6c01e35b..84eb5f6da 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 a4e2158ce..7d8cc7826 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys if 'setuptools' in sys.modules: diff --git a/numpy/distutils/compat.py b/numpy/distutils/compat.py index bd4184dcd..9a81cd392 100644 --- a/numpy/distutils/compat.py +++ b/numpy/distutils/compat.py @@ -2,7 +2,7 @@ numpy.distutils """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py index 77e2eb5e1..7c5a0ef39 100644 --- a/numpy/distutils/conv_template.py +++ b/numpy/distutils/conv_template.py @@ -24,7 +24,7 @@ combinations of the variables using (inside the comment portion of the inner loo This will exlude the pattern where var1 is value1 and var2 is value2 when the result is being generated. - + In the main body each replace will use one entry from the list of named replacements @@ -78,7 +78,7 @@ Example: 3, 3, jim """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['process_str', 'process_file'] @@ -278,7 +278,7 @@ def resolve_includes(source): if not os.path.isabs(fn): fn = os.path.join(d,fn) if os.path.isfile(fn): - print ('Including file',fn) + print('Including file',fn) lines.extend(resolve_includes(fn)) else: lines.append(line) diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index 711d5a223..3b5ae5630 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from distutils.core import * diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index aaf642691..775929fa1 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -12,7 +12,7 @@ NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['cpu'] diff --git a/numpy/distutils/environment.py b/numpy/distutils/environment.py index 1360d82fe..3798e16f5 100644 --- a/numpy/distutils/environment.py +++ b/numpy/distutils/environment.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from distutils.dist import Distribution diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py index 923486158..c4e035a31 100644 --- a/numpy/distutils/exec_command.py +++ b/numpy/distutils/exec_command.py @@ -44,7 +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, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['exec_command','find_executable'] diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py index f58b27780..b30adb397 100644 --- a/numpy/distutils/extension.py +++ b/numpy/distutils/extension.py @@ -6,7 +6,7 @@ modules in setup scripts. Overridden to support f2py. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __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 c0b587fed..3a5e76091 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -13,7 +13,7 @@ should be a list. But note that FCompiler.executables is actually a dictionary of commands. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['FCompiler','new_fcompiler','show_fcompilers', 'dummy_fortran_file'] diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 2fb579e35..03430fb0e 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -5,7 +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, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py index 16f3a0e54..3831f88f7 100644 --- a/numpy/distutils/fcompiler/compaq.py +++ b/numpy/distutils/fcompiler/compaq.py @@ -1,6 +1,6 @@ #http://www.compaq.com/fortran/docs/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py index 41b781010..20c2c0d03 100644 --- a/numpy/distutils/fcompiler/g95.py +++ b/numpy/distutils/fcompiler/g95.py @@ -1,5 +1,5 @@ # http://g95.sourceforge.net/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 80dbf48c6..9b4096899 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import os diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py index 250159107..5560e199a 100644 --- a/numpy/distutils/fcompiler/hpux.py +++ b/numpy/distutils/fcompiler/hpux.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py index 09001c500..5811be876 100644 --- a/numpy/distutils/fcompiler/ibm.py +++ b/numpy/distutils/fcompiler/ibm.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index b975d1f1b..a5be3c46d 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -1,5 +1,5 @@ # http://developer.intel.com/software/products/compilers/flin/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py index 208f09a27..afca8e422 100644 --- a/numpy/distutils/fcompiler/lahey.py +++ b/numpy/distutils/fcompiler/lahey.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py index 433f053e3..21fa00642 100644 --- a/numpy/distutils/fcompiler/mips.py +++ b/numpy/distutils/fcompiler/mips.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 8cbd15f60..b02cf43a6 100644 --- a/numpy/distutils/fcompiler/nag.py +++ b/numpy/distutils/fcompiler/nag.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py index ee7e6dee9..039957233 100644 --- a/numpy/distutils/fcompiler/none.py +++ b/numpy/distutils/fcompiler/none.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py index 3b3c31e00..1902bbc24 100644 --- a/numpy/distutils/fcompiler/pathf95.py +++ b/numpy/distutils/fcompiler/pathf95.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler @@ -35,4 +35,4 @@ if __name__ == '__main__': from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='pathf95') compiler.customize() - print compiler.get_version() + print(compiler.get_version()) diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index 959f86d68..1cc201f22 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, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler from sys import platform @@ -35,7 +35,7 @@ class PGroupFCompiler(FCompiler): } pic_flags = ['-fpic'] - + module_dir_switch = '-module ' module_include_switch = '-I' @@ -46,7 +46,7 @@ class PGroupFCompiler(FCompiler): return ['-fast'] def get_flags_debug(self): return ['-g'] - + if platform == 'darwin': def get_flags_linker_so(self): return ["-dynamic", '-undefined', 'dynamic_lookup'] diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py index bff37a543..07d4eeb8e 100644 --- a/numpy/distutils/fcompiler/sun.py +++ b/numpy/distutils/fcompiler/sun.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 2d6d164a1..05bbc10ba 100644 --- a/numpy/distutils/fcompiler/vast.py +++ b/numpy/distutils/fcompiler/vast.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py index dc933dd6a..3547e808b 100644 --- a/numpy/distutils/from_template.py +++ b/numpy/distutils/from_template.py @@ -45,7 +45,7 @@ process_file(filename) <ctypereal=float,double,\\0,\\1> """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['process_str','process_file'] @@ -166,10 +166,9 @@ def expand_sub(substr,names): elif num == numsubs: rules[r] = rule else: - print("Mismatch in number of replacements (base <%s=%s>)"\ - " for <%s=%s>. Ignoring." % (base_rule, - ','.join(rules[base_rule]), - r,thelist)) + print("Mismatch in number of replacements (base <%s=%s>)" + " for <%s=%s>. Ignoring." % + (base_rule, ','.join(rules[base_rule]), r,thelist)) if not rules: return substr @@ -216,7 +215,7 @@ def resolve_includes(source): if not os.path.isabs(fn): fn = os.path.join(d,fn) if os.path.isfile(fn): - print ('Including file',fn) + print('Including file', fn) lines.extend(resolve_includes(fn)) else: lines.append(line) diff --git a/numpy/distutils/info.py b/numpy/distutils/info.py index de3dc4f48..2f5310665 100644 --- a/numpy/distutils/info.py +++ b/numpy/distutils/info.py @@ -1,6 +1,6 @@ """ Enhanced distutils with Fortran compilers support and more. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function postpone_import = True diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 58208647d..16fe3a5fb 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.unixccompiler import UnixCCompiler from numpy.distutils.exec_command import find_executable diff --git a/numpy/distutils/lib2def.py b/numpy/distutils/lib2def.py index b2c4f1f28..7316547a3 100644 --- a/numpy/distutils/lib2def.py +++ b/numpy/distutils/lib2def.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import sys @@ -48,8 +48,8 @@ libfile, deffile = parse_cmd()""" elif sys.argv[1][-4:] == '.def' and sys.argv[2][-4:] == '.lib': deffile, libfile = sys.argv[1:] else: - print "I'm assuming that your first argument is the library" - print "and the second is the DEF file." + print("I'm assuming that your first argument is the library") + print("and the second is the DEF file.") elif len(sys.argv) == 2: if sys.argv[1][-4:] == '.def': deffile = sys.argv[1] diff --git a/numpy/distutils/line_endings.py b/numpy/distutils/line_endings.py index 93f5421c0..fe1efdca6 100644 --- a/numpy/distutils/line_endings.py +++ b/numpy/distutils/line_endings.py @@ -1,30 +1,30 @@ """ Functions for converting from DOS to UNIX line endings """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, re, os def dos2unix(file): "Replace CRLF with LF in argument files. Print names of changed files." if os.path.isdir(file): - print file, "Directory!" + print(file, "Directory!") return data = open(file, "rb").read() if '\0' in data: - print file, "Binary!" + print(file, "Binary!") return newdata = re.sub("\r\n", "\n", data) if newdata != data: - print 'dos2unix:', file + print('dos2unix:', file) f = open(file, "wb") f.write(newdata) f.close() return file else: - print file, 'ok' + print(file, 'ok') def dos2unix_one_dir(modified_files,dir_name,file_names): for file in file_names: @@ -42,23 +42,23 @@ def dos2unix_dir(dir_name): def unix2dos(file): "Replace LF with CRLF in argument files. Print names of changed files." if os.path.isdir(file): - print file, "Directory!" + print(file, "Directory!") return data = open(file, "rb").read() if '\0' in data: - print file, "Binary!" + print(file, "Binary!") return newdata = re.sub("\r\n", "\n", data) newdata = re.sub("\n", "\r\n", newdata) if newdata != data: - print 'unix2dos:', file + print('unix2dos:', file) f = open(file, "wb") f.write(newdata) f.close() return file else: - print file, 'ok' + print(file, 'ok') def unix2dos_one_dir(modified_files,dir_name,file_names): for file in file_names: diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py index 41c9a56da..2f801a732 100644 --- a/numpy/distutils/log.py +++ b/numpy/distutils/log.py @@ -1,5 +1,5 @@ # Colored log, requires Python 2.3 or up. -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from distutils.log import * diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index c07a58e26..75687be84 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -7,7 +7,7 @@ Support code for building Python extensions on Windows. # 3. Force windows to use g77 """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -240,7 +240,7 @@ class Mingw32CCompiler(distutils.cygwinccompiler.CygwinCCompiler): def find_python_dll(): maj, min, micro = [int(i) for i in sys.version_info[:3]] dllname = 'python%d%d.dll' % (maj, min) - print ("Looking for %s" % dllname) + print("Looking for %s" % dllname) # We can't do much here: # - find it in python main dir diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index dea993b20..7a38bedc3 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re @@ -220,8 +220,8 @@ def _fix_paths(paths,local_path,include_non_existing): else: if include_non_existing: new_paths.append(n) - print('could not resolve pattern in %r: %r' \ - % (local_path,n)) + print('could not resolve pattern in %r: %r' % + (local_path,n)) else: n2 = njoin(local_path,n) if os.path.exists(n2): @@ -232,8 +232,8 @@ def _fix_paths(paths,local_path,include_non_existing): elif include_non_existing: new_paths.append(n) if not os.path.exists(n): - print('non-existing path in %r: %r' \ - % (local_path,n)) + print('non-existing path in %r: %r' % + (local_path,n)) elif is_sequence(n): new_paths.extend(_fix_paths(n,local_path,include_non_existing)) @@ -627,7 +627,7 @@ def get_data_files(data): if os.path.isfile(s): filenames.append(s) else: - print('Not existing data file:',s) + print('Not existing data file:', s) else: raise TypeError(repr(s)) return filenames @@ -1054,7 +1054,7 @@ class Configuration(object): # for path in paths: if not os.path.isdir(path): - print('Not a directory, skipping',path) + print('Not a directory, skipping', path) continue rpath = rel_path(path, self.local_path) path_list = rpath.split(os.sep) diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index a0d75670b..040ee632b 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re @@ -429,7 +429,7 @@ if __name__ == '__main__': files = glob.glob("*.ini") for f in files: info = read_config(f) - print ("%s\t%s - %s" % (info.name, info.name, info.description)) + print("%s\t%s - %s" % (info.name, info.name, info.description)) pkg_name = args[1] import os @@ -455,10 +455,10 @@ if __name__ == '__main__': info.vars[name] = value if options.cflags: - print (info.cflags(section)) + print(info.cflags(section)) if options.libs: - print (info.libs(section)) + print(info.libs(section)) if options.version: - print (info.version) + print(info.version) if options.min_version: - print (info.version >= options.min_version) + print(info.version >= options.min_version) diff --git a/numpy/distutils/numpy_distribution.py b/numpy/distutils/numpy_distribution.py index 353e18a51..6ae19d16b 100644 --- a/numpy/distutils/numpy_distribution.py +++ b/numpy/distutils/numpy_distribution.py @@ -1,5 +1,5 @@ # XXX: Handle setuptools ? -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.core import Distribution diff --git a/numpy/distutils/pathccompiler.py b/numpy/distutils/pathccompiler.py index e847e7d0a..fc9872db3 100644 --- a/numpy/distutils/pathccompiler.py +++ b/numpy/distutils/pathccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.unixccompiler import UnixCCompiler diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py index 1d29d706c..e4dbe240b 100644 --- a/numpy/distutils/setup.py +++ b/numpy/distutils/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function 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 ff32daf69..9864288bf 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -110,7 +110,7 @@ this distribution for specifics. NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import os diff --git a/numpy/distutils/tests/f2py_ext/__init__.py b/numpy/distutils/tests/f2py_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/f2py_ext/__init__.py +++ b/numpy/distutils/tests/f2py_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py index edaa22287..658b01bb6 100644 --- a/numpy/distutils/tests/f2py_ext/setup.py +++ b/numpy/distutils/tests/f2py_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py index 149256d72..bee1b9870 100644 --- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py +++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/f2py_f90_ext/__init__.py b/numpy/distutils/tests/f2py_f90_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/f2py_f90_ext/__init__.py +++ b/numpy/distutils/tests/f2py_f90_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py index 0a6bea989..4b4c2390c 100644 --- a/numpy/distutils/tests/f2py_f90_ext/setup.py +++ b/numpy/distutils/tests/f2py_f90_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration 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 d68981c04..92e559291 100644 --- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py +++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/gen_ext/__init__.py b/numpy/distutils/tests/gen_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/gen_ext/__init__.py +++ b/numpy/distutils/tests/gen_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py index cbf135dc1..ccab2a45e 100644 --- a/numpy/distutils/tests/gen_ext/setup.py +++ b/numpy/distutils/tests/gen_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function 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 0f194255d..7bab5a6be 100644 --- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py +++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/pyrex_ext/__init__.py b/numpy/distutils/tests/pyrex_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/pyrex_ext/__init__.py +++ b/numpy/distutils/tests/pyrex_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/pyrex_ext/setup.py b/numpy/distutils/tests/pyrex_ext/setup.py index 287ec5e3b..ad1f5207a 100644 --- a/numpy/distutils/tests/pyrex_ext/setup.py +++ b/numpy/distutils/tests/pyrex_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py index a2bb091ea..c9fdd6c6d 100644 --- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py +++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/setup.py b/numpy/distutils/tests/setup.py index c472e1788..61f6ba751 100644 --- a/numpy/distutils/tests/setup.py +++ b/numpy/distutils/tests/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/swig_ext/__init__.py b/numpy/distutils/tests/swig_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/swig_ext/__init__.py +++ b/numpy/distutils/tests/swig_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py index 99b688985..7ce3061a1 100644 --- a/numpy/distutils/tests/swig_ext/setup.py +++ b/numpy/distutils/tests/swig_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py index 419ca53d8..3164c0831 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py index f876bad16..82daed728 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example2.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/test_exec_command.py b/numpy/distutils/tests/test_exec_command.py index 3e85fcd3e..0931f749b 100644 --- a/numpy/distutils/tests/test_exec_command.py +++ b/numpy/distutils/tests/test_exec_command.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py index 09a7275f8..5c47edcb9 100644 --- a/numpy/distutils/tests/test_fcompiler_gnu.py +++ b/numpy/distutils/tests/test_fcompiler_gnu.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py index 8e3ba5fd3..eda209ebe 100644 --- a/numpy/distutils/tests/test_fcompiler_intel.py +++ b/numpy/distutils/tests/test_fcompiler_intel.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py index b19c09f81..fab00aaa3 100644 --- a/numpy/distutils/tests/test_misc_util.py +++ b/numpy/distutils/tests/test_misc_util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function 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 e25f47d76..5443ece48 100644 --- a/numpy/distutils/tests/test_npy_pkg_config.py +++ b/numpy/distutils/tests/test_npy_pkg_config.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from tempfile import mkstemp diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py index 2825a899b..95b676ecf 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py @@ -2,7 +2,7 @@ unixccompiler - can handle very long argument lists for ar. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/doc/__init__.py b/numpy/doc/__init__.py index 028d0c343..86d45f618 100644 --- a/numpy/doc/__init__.py +++ b/numpy/doc/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/doc/basics.py b/numpy/doc/basics.py index b56d61380..bb16c3a91 100644 --- a/numpy/doc/basics.py +++ b/numpy/doc/basics.py @@ -136,5 +136,5 @@ value is inside an array or not. NumPy scalars also have many of the same methods arrays do. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/broadcasting.py b/numpy/doc/broadcasting.py index bbbd5bdcc..3826a70b3 100644 --- a/numpy/doc/broadcasting.py +++ b/numpy/doc/broadcasting.py @@ -175,5 +175,5 @@ See `this article <http://www.scipy.org/EricsBroadcastingDoc>`_ for illustrations of broadcasting concepts. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/byteswapping.py b/numpy/doc/byteswapping.py index df767f1bc..7baa648a1 100644 --- a/numpy/doc/byteswapping.py +++ b/numpy/doc/byteswapping.py @@ -135,5 +135,5 @@ the previous operations: False """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/constants.py b/numpy/doc/constants.py index 5fe93fa2b..36f94d307 100644 --- a/numpy/doc/constants.py +++ b/numpy/doc/constants.py @@ -10,7 +10,7 @@ Numpy includes several constants: # # Note: the docstring is autogenerated. # -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import textwrap, re diff --git a/numpy/doc/creation.py b/numpy/doc/creation.py index 045b476e3..b096edd3d 100644 --- a/numpy/doc/creation.py +++ b/numpy/doc/creation.py @@ -141,5 +141,5 @@ random values, and some utility functions to generate special matrices (e.g. diagonal). """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/glossary.py b/numpy/doc/glossary.py index 02b291b64..b9053cc07 100644 --- a/numpy/doc/glossary.py +++ b/numpy/doc/glossary.py @@ -415,5 +415,5 @@ Glossary and f2py (which wraps Fortran). """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/howtofind.py b/numpy/doc/howtofind.py index e456a7422..89f8ac9b9 100644 --- a/numpy/doc/howtofind.py +++ b/numpy/doc/howtofind.py @@ -7,5 +7,5 @@ How to Find Stuff How to find things in NumPy. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/indexing.py b/numpy/doc/indexing.py index 821240efd..997aee1b7 100644 --- a/numpy/doc/indexing.py +++ b/numpy/doc/indexing.py @@ -405,5 +405,5 @@ converted to an array as a list would be. As an example: :: 40 """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/internals.py b/numpy/doc/internals.py index ed2991a32..73ec51332 100644 --- a/numpy/doc/internals.py +++ b/numpy/doc/internals.py @@ -160,5 +160,5 @@ when accessing elements of an array. Granted, it goes against the grain, but it is more in line with Python semantics and the natural order of the data. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/io.py b/numpy/doc/io.py index a212b9697..aeffdaca0 100644 --- a/numpy/doc/io.py +++ b/numpy/doc/io.py @@ -7,5 +7,5 @@ Array I/O Placeholder for array I/O documentation. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/jargon.py b/numpy/doc/jargon.py index 684674816..56b25ad7a 100644 --- a/numpy/doc/jargon.py +++ b/numpy/doc/jargon.py @@ -7,5 +7,5 @@ Jargon Placeholder for computer science, engineering and other jargon. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/methods_vs_functions.py b/numpy/doc/methods_vs_functions.py index 7090190c0..89c26b841 100644 --- a/numpy/doc/methods_vs_functions.py +++ b/numpy/doc/methods_vs_functions.py @@ -7,5 +7,5 @@ Methods vs. Functions Placeholder for Methods vs. Functions documentation. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/misc.py b/numpy/doc/misc.py index a16698a20..79c16a56e 100644 --- a/numpy/doc/misc.py +++ b/numpy/doc/misc.py @@ -226,5 +226,5 @@ Interfacing to C++: 5) SIP (used mainly in PyQT) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/performance.py b/numpy/doc/performance.py index e2ca2c53e..6b0b55042 100644 --- a/numpy/doc/performance.py +++ b/numpy/doc/performance.py @@ -7,5 +7,5 @@ Performance Placeholder for Improving Performance documentation. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/structured_arrays.py b/numpy/doc/structured_arrays.py index cd308c1cf..be3d5cc7d 100644 --- a/numpy/doc/structured_arrays.py +++ b/numpy/doc/structured_arrays.py @@ -221,5 +221,5 @@ You can find some more information on recarrays and structured arrays <http://www.scipy.org/Cookbook/Recarray>`_. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/subclassing.py b/numpy/doc/subclassing.py index 8734a0567..31bf6e211 100644 --- a/numpy/doc/subclassing.py +++ b/numpy/doc/subclassing.py @@ -557,5 +557,5 @@ how this can work, have a look at the ``memmap`` class in """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/doc/ufuncs.py b/numpy/doc/ufuncs.py index a1de5681f..0b94e0537 100644 --- a/numpy/doc/ufuncs.py +++ b/numpy/doc/ufuncs.py @@ -135,5 +135,5 @@ results in an error. There are two alternatives: a convenient way to apply these operators. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/dual.py b/numpy/dual.py index 481e42d0c..00bdcb395 100644 --- a/numpy/dual.py +++ b/numpy/dual.py @@ -10,7 +10,7 @@ Numpy. .. _Scipy : http://www.scipy.org """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # This module should be used for functions both in numpy and scipy if # you want to use the numpy version if available but the scipy version diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py index 6b20f94c4..26a63daa8 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['run_main','compile','f2py_testing'] diff --git a/numpy/f2py/__version__.py b/numpy/f2py/__version__.py index 44791aa37..49a2199bf 100644 --- a/numpy/f2py/__version__.py +++ b/numpy/f2py/__version__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function major = 2 diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py index 5b13747f1..608ae5566 100644 --- a/numpy/f2py/auxfuncs.py +++ b/numpy/f2py/auxfuncs.py @@ -14,7 +14,7 @@ $Date: 2005/07/24 19:01:55 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.65 $"[10:-1] diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py index 117ea2233..1aa67ff74 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -11,7 +11,7 @@ $Date: 2005/05/06 10:57:33 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.60 $"[10:-1] diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py index bc565a904..eb8cc6fc6 100644 --- a/numpy/f2py/cb_rules.py +++ b/numpy/f2py/cb_rules.py @@ -13,7 +13,7 @@ $Date: 2005/07/20 11:27:58 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.53 $"[10:-1] diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index a0110c530..a83046aa3 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -14,7 +14,7 @@ $Date: 2005/05/06 11:42:34 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.75 $"[10:-1] @@ -1214,7 +1214,7 @@ def get_needs(): del outneeds[n][0] if saveout and (0 not in map(lambda x,y:x==y,saveout,outneeds[n])) \ and outneeds[n] != []: - print n,saveout + print(n,saveout) errmess('get_needs: no progress in sorting needs, probably circular dependence, skipping.\n') out=out+saveout break diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py index aec0ef1b1..ed733a706 100644 --- a/numpy/f2py/common_rules.py +++ b/numpy/f2py/common_rules.py @@ -13,7 +13,7 @@ $Date: 2005/05/06 10:57:33 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.19 $"[10:-1] diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 2a7f137d2..97a58813e 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -138,7 +138,7 @@ TODO: The above may be solved by creating appropriate preprocessor program, for example. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.177 $"[10:-1] import platform @@ -922,7 +922,7 @@ def analyzeline(m,case,line): if not m1: if case in ['public','private']: k='' else: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: no name pattern found in %s statement for %s. Skipping.\n'%(case,`e`)) continue else: @@ -1158,7 +1158,7 @@ def analyzeline(m,case,line): else: pass else: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: Could not crack the use statement.\n') elif case in ['f2pyenhancements']: if 'f2pyenhancements' not in groupcache[groupcounter]: @@ -1182,7 +1182,7 @@ def analyzeline(m,case,line): m.group('this')) else: if verbose>1: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: No code implemented for line.\n') def appendmultiline(group, context_name,ml): @@ -2046,7 +2046,7 @@ def get_parameters(vars, global_params={}): if nl!=n: params[nl] = params[n] else: - print vars[n] + print(vars[n]) outmess('get_parameters:parameter %s does not have value?!\n'%(`n`)) return params diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py index 59ef5205b..f00c3f0ac 100644 --- a/numpy/f2py/diagnose.py +++ b/numpy/f2py/diagnose.py @@ -1,43 +1,43 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys import tempfile def run_command(cmd): - print 'Running %r:' % (cmd) + print('Running %r:' % (cmd)) s = os.system(cmd) - print '------' + print('------') def run(): _path = os.getcwd() os.chdir(tempfile.gettempdir()) - print '------' - print 'os.name=%r' % (os.name) - print '------' - print 'sys.platform=%r' % (sys.platform) - print '------' - print 'sys.version:' - print sys.version - print '------' - print 'sys.prefix:' - print sys.prefix - print '------' - print 'sys.path=%r' % (':'.join(sys.path)) - print '------' + print('------') + print('os.name=%r' % (os.name)) + print('------') + print('sys.platform=%r' % (sys.platform)) + print('------') + print('sys.version:') + print(sys.version) + print('------') + print('sys.prefix:') + print(sys.prefix) + print('------') + print('sys.path=%r' % (':'.join(sys.path))) + print('------') try: import numpy has_newnumpy = 1 except ImportError: - print 'Failed to import new numpy:', sys.exc_info()[1] + print('Failed to import new numpy:', sys.exc_info()[1]) has_newnumpy = 0 try: from numpy.f2py import f2py2e has_f2py2e = 1 except ImportError: - print 'Failed to import f2py2e:',sys.exc_info()[1] + print('Failed to import f2py2e:',sys.exc_info()[1]) has_f2py2e = 0 try: @@ -48,102 +48,102 @@ def run(): import numpy_distutils has_numpy_distutils = 1 except ImportError: - print 'Failed to import numpy_distutils:',sys.exc_info()[1] + print('Failed to import numpy_distutils:',sys.exc_info()[1]) has_numpy_distutils = 0 if has_newnumpy: try: - print 'Found new numpy version %r in %s' % \ - (numpy.__version__, numpy.__file__) + print('Found new numpy version %r in %s' % \ + (numpy.__version__, numpy.__file__)) except Exception as msg: - print 'error:', msg - print '------' + print('error:', msg) + print('------') if has_f2py2e: try: - print 'Found f2py2e version %r in %s' % \ - (f2py2e.__version__.version,f2py2e.__file__) + print('Found f2py2e version %r in %s' % \ + (f2py2e.__version__.version,f2py2e.__file__)) except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') if has_numpy_distutils: try: if has_numpy_distutils == 2: - print 'Found numpy.distutils version %r in %r' % (\ + print('Found numpy.distutils version %r in %r' % (\ numpy.distutils.__version__, - numpy.distutils.__file__) + numpy.distutils.__file__)) else: - print 'Found numpy_distutils version %r in %r' % (\ + print('Found numpy_distutils version %r in %r' % (\ numpy_distutils.numpy_distutils_version.numpy_distutils_version, - numpy_distutils.__file__) - print '------' + numpy_distutils.__file__)) + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') try: if has_numpy_distutils == 1: - print 'Importing numpy_distutils.command.build_flib ...', + print('Importing numpy_distutils.command.build_flib ...', end=' ') import numpy_distutils.command.build_flib as build_flib - print 'ok' - print '------' + print('ok') + print('------') try: - print 'Checking availability of supported Fortran compilers:' + print('Checking availability of supported Fortran compilers:') for compiler_class in build_flib.all_compilers: compiler_class(verbose=1).is_available() - print '------' + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') except Exception as msg: - print 'error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)' - print '------' + print('error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)') + print('------') try: if has_numpy_distutils == 2: - print 'Importing numpy.distutils.fcompiler ...', + print('Importing numpy.distutils.fcompiler ...', end=' ') import numpy.distutils.fcompiler as fcompiler else: - print 'Importing numpy_distutils.fcompiler ...', + print('Importing numpy_distutils.fcompiler ...', end=' ') import numpy_distutils.fcompiler as fcompiler - print 'ok' - print '------' + print('ok') + print('------') try: - print 'Checking availability of supported Fortran compilers:' + print('Checking availability of supported Fortran compilers:') fcompiler.show_fcompilers() - print '------' + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') try: if has_numpy_distutils == 2: - print 'Importing numpy.distutils.cpuinfo ...', + print('Importing numpy.distutils.cpuinfo ...', end=' ') from numpy.distutils.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') else: try: - print 'Importing numpy_distutils.command.cpuinfo ...', + print('Importing numpy_distutils.command.cpuinfo ...', end=' ') from numpy_distutils.command.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') except Exception as msg: - print 'error:',msg,'(ignore it)' - print 'Importing numpy_distutils.cpuinfo ...', + print('error:',msg,'(ignore it)') + print('Importing numpy_distutils.cpuinfo ...', end=' ') from numpy_distutils.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') cpu = cpuinfo() - print 'CPU information:', + print('CPU information:', end=' ') for name in dir(cpuinfo): if name[0]=='_' and name[1]!='_' and getattr(cpu,name[1:])(): - print name[1:], - print '------' + print(name[1:], end=' ') + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') os.chdir(_path) if __name__ == "__main__": run() diff --git a/numpy/f2py/doc/collectinput.py b/numpy/f2py/doc/collectinput.py index 396e4a912..317fde5b2 100755 --- a/numpy/f2py/doc/collectinput.py +++ b/numpy/f2py/doc/collectinput.py @@ -19,7 +19,7 @@ Usage: collectinput # in and out are stdin and stdout """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "0.0" @@ -68,16 +68,16 @@ for l in fileinput.input(fi): except: flag=0 if flag==0: sys.stderr.write('Could not open a file: '+fn+'\n') - print l+l1 + print(l+l1) continue elif flag==1: sys.stderr.write(fn+'\n') - print '%%%%% Begin of '+fn - print getoutput(sys.argv[0]+' < '+fn) - print '%%%%% End of '+fn + print('%%%%% Begin of '+fn) + print(getoutput(sys.argv[0]+' < '+fn)) + print('%%%%% End of '+fn) else: sys.stderr.write('Could not extract a file name from: '+l) - print l+l1 + print(l+l1) else: - print l+l1 + print(l+l1) sys.stdout.close() diff --git a/numpy/f2py/docs/pytest.py b/numpy/f2py/docs/pytest.py index 40d6b0c5e..b61a607fe 100644 --- a/numpy/f2py/docs/pytest.py +++ b/numpy/f2py/docs/pytest.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function #File: pytest.py import Numeric diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py index e80bc493b..8dfaa7a52 100644 --- a/numpy/f2py/docs/usersguide/setup_example.py +++ b/numpy/f2py/docs/usersguide/setup_example.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # File: setup_example.py diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py index aee8afba0..0886e8ebf 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -14,7 +14,7 @@ $Date: 2005/05/06 08:31:19 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from . import __version__ f2py_version = __version__.version @@ -212,7 +212,7 @@ def scaninputline(inputline): elif l=='-h': f2=1 elif l=='-m': f3=1 elif l[:2]=='-v': - print f2py_version + print(f2py_version) sys.exit() elif l=='--show-compilers': f5=1 @@ -242,7 +242,7 @@ def scaninputline(inputline): elif f==-1: skipfuncs.append(l) elif f==0: onlyfuncs.append(l) if not f5 and not files and not modulename: - print __usage__ + print(__usage__) sys.exit() if not os.path.isdir(buildpath): if not verbose: @@ -477,7 +477,7 @@ def run_compile(): nv = vmap[ov] except KeyError: if ov not in vmap.values(): - print 'Unknown vendor: "%s"' % (s[len(v):]) + print('Unknown vendor: "%s"' % (s[len(v):])) nv = ov i = flib_flags.index(s) flib_flags[i] = '--fcompiler=' + nv @@ -533,7 +533,7 @@ def run_compile(): if len(name_value)==2: define_macros[i] = tuple(name_value) else: - print 'Invalid use of -D:',name_value + print('Invalid use of -D:',name_value) from numpy.distutils.system_info import get_info diff --git a/numpy/f2py/f2py_testing.py b/numpy/f2py/f2py_testing.py index b0f396ad4..e5ba8a9d5 100644 --- a/numpy/f2py/f2py_testing.py +++ b/numpy/f2py/f2py_testing.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re @@ -34,13 +34,13 @@ def run(runtest,test_functions,repeat=1): else: diff_memusage2 = memusage() - start_memusage if diff_memusage2!=diff_memusage: - print 'memory usage change at step %i:' % i,\ + print('memory usage change at step %i:' % i,\ diff_memusage2-diff_memusage,\ - fname + fname) diff_memusage = diff_memusage2 current_memusage = memusage() - print 'run',repeat*len(test_functions),'tests',\ - 'in %.2f seconds' % ((jiffies()-start_jiffies)/100.0) + print('run',repeat*len(test_functions),'tests',\ + 'in %.2f seconds' % ((jiffies()-start_jiffies)/100.0)) if start_memusage: - print 'initial virtual memory size:',start_memusage,'bytes' - print 'current virtual memory size:',current_memusage,'bytes' + print('initial virtual memory size:',start_memusage,'bytes') + print('current virtual memory size:',current_memusage,'bytes') diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py index bc571371b..c251b2340 100644 --- a/numpy/f2py/f90mod_rules.py +++ b/numpy/f2py/f90mod_rules.py @@ -13,7 +13,7 @@ $Date: 2005/02/03 19:30:23 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.27 $"[10:-1] @@ -171,7 +171,7 @@ def buildhooks(pymod): if hasbody(m): for b in m['body']: if not isroutine(b): - print 'Skipping',b['block'],b['name'] + print('Skipping',b['block'],b['name']) continue modobjs.append('%s()'%(b['name'])) b['modulename'] = m['name'] diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py index 7597e43ae..f69750dd0 100644 --- a/numpy/f2py/func2subr.py +++ b/numpy/f2py/func2subr.py @@ -13,7 +13,7 @@ $Date: 2004/11/26 11:13:06 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.16 $"[10:-1] diff --git a/numpy/f2py/info.py b/numpy/f2py/info.py index 07a750588..c895c5de2 100644 --- a/numpy/f2py/info.py +++ b/numpy/f2py/info.py @@ -1,6 +1,6 @@ """Fortran to Python Interface Generator. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function postpone_import = True diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index 38c43b4ae..0165a9e72 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -50,7 +50,7 @@ $Date: 2005/08/30 08:58:42 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.129 $"[10:-1] diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py index 43de25225..1fae54531 100644 --- a/numpy/f2py/setup.py +++ b/numpy/f2py/setup.py @@ -16,7 +16,7 @@ $Date: 2005/01/30 17:22:14 $ Pearu Peterson """ -from __future__ import division +from __future__ import division, print_function __version__ = "$Id: setup.py,v 1.32 2005/01/30 17:22:14 pearu Exp $" diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py index 586833e68..773dd75a1 100644 --- a/numpy/f2py/tests/test_array_from_pyobj.py +++ b/numpy/f2py/tests/test_array_from_pyobj.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import unittest import os diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py index 19a557530..f3a840272 100644 --- a/numpy/f2py/tests/test_assumed_shape.py +++ b/numpy/f2py/tests/test_assumed_shape.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py index 51b1bb1b4..6ae473ac7 100644 --- a/numpy/f2py/tests/test_callback.py +++ b/numpy/f2py/tests/test_callback.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py index d24099b05..493c06942 100644 --- a/numpy/f2py/tests/test_kind.py +++ b/numpy/f2py/tests/test_kind.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py index d62098ab4..c4cb4889b 100644 --- a/numpy/f2py/tests/test_mixed.py +++ b/numpy/f2py/tests/test_mixed.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py index 5a68bec72..97378959f 100644 --- a/numpy/f2py/tests/test_return_character.py +++ b/numpy/f2py/tests/test_return_character.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py index 00ba1cfe6..14bf8f6ad 100644 --- a/numpy/f2py/tests/test_return_complex.py +++ b/numpy/f2py/tests/test_return_complex.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py index 6c55cc1b9..77d26dcc7 100644 --- a/numpy/f2py/tests/test_return_integer.py +++ b/numpy/f2py/tests/test_return_integer.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py index af35c50d1..42a502806 100644 --- a/numpy/f2py/tests/test_return_logical.py +++ b/numpy/f2py/tests/test_return_logical.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py index 0ea4373fb..dfa4d68c9 100644 --- a/numpy/f2py/tests/test_return_real.py +++ b/numpy/f2py/tests/test_return_real.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py index 1a41ce972..75398060b 100644 --- a/numpy/f2py/tests/test_size.py +++ b/numpy/f2py/tests/test_size.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py index 0da4bc310..56aff2b66 100644 --- a/numpy/f2py/tests/util.py +++ b/numpy/f2py/tests/util.py @@ -5,7 +5,7 @@ Utility functions for - detecting if compilers are present """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py index c027baef8..fc3843126 100644 --- a/numpy/f2py/use_rules.py +++ b/numpy/f2py/use_rules.py @@ -15,7 +15,7 @@ $Date: 2000/09/10 12:35:43 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.3 $"[10:-1] @@ -104,6 +104,6 @@ def buildusevar(name,realname,vars,usemodulename): rd=dictappend({},vrd) var=vars[realname] - print name,realname,vars[realname] + print(name,realname,vars[realname]) ret=applyrules(usemodule_rules,rd) return ret diff --git a/numpy/fft/__init__.py b/numpy/fft/__init__.py index 001ac59b0..96809a94f 100644 --- a/numpy/fft/__init__.py +++ b/numpy/fft/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # To get sub-modules from .info import __doc__ diff --git a/numpy/fft/fftpack.py b/numpy/fft/fftpack.py index 59ab5d9db..4961b2989 100644 --- a/numpy/fft/fftpack.py +++ b/numpy/fft/fftpack.py @@ -30,7 +30,7 @@ The underlying code for these functions is an f2c-translated and modified version of the FFTPACK routines. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['fft','ifft', 'rfft', 'irfft', 'hfft', 'ihfft', 'rfftn', 'irfftn', 'rfft2', 'irfft2', 'fft2', 'ifft2', 'fftn', 'ifftn'] diff --git a/numpy/fft/helper.py b/numpy/fft/helper.py index 910ccc9a2..56d03619f 100644 --- a/numpy/fft/helper.py +++ b/numpy/fft/helper.py @@ -2,7 +2,7 @@ Discrete Fourier Transforms - helper.py """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # Created by Pearu Peterson, September 2002 diff --git a/numpy/fft/info.py b/numpy/fft/info.py index 6b5a1db79..916d452f2 100644 --- a/numpy/fft/info.py +++ b/numpy/fft/info.py @@ -174,6 +174,6 @@ Examples For examples, see the various functions. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function depends = ['core'] diff --git a/numpy/fft/setup.py b/numpy/fft/setup.py index cf0e6bb58..23a945fce 100644 --- a/numpy/fft/setup.py +++ b/numpy/fft/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): diff --git a/numpy/fft/tests/test_fftpack.py b/numpy/fft/tests/test_fftpack.py index b592d788d..50702ab3c 100644 --- a/numpy/fft/tests/test_fftpack.py +++ b/numpy/fft/tests/test_fftpack.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import TestCase, run_module_suite, assert_array_almost_equal diff --git a/numpy/fft/tests/test_helper.py b/numpy/fft/tests/test_helper.py index a57cbd81a..f30d9fff6 100644 --- a/numpy/fft/tests/test_helper.py +++ b/numpy/fft/tests/test_helper.py @@ -4,7 +4,7 @@ Copied from fftpack.helper by Pearu Peterson, October 2005 """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import TestCase, run_module_suite, assert_array_almost_equal diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index 37c06c014..12acae95b 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .info import __doc__ from numpy.version import version as __version__ diff --git a/numpy/lib/_datasource.py b/numpy/lib/_datasource.py index 9f0bb1ae8..13060593d 100644 --- a/numpy/lib/_datasource.py +++ b/numpy/lib/_datasource.py @@ -31,7 +31,7 @@ Example:: >>> fp.close() """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __docformat__ = "restructuredtext en" diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index f3097be23..34c85e47e 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -1,7 +1,7 @@ """A collection of functions designed to help I/O with ascii files. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __docformat__ = "restructuredtext en" diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py index 31bf609f5..de909bc87 100644 --- a/numpy/lib/arraypad.py +++ b/numpy/lib/arraypad.py @@ -3,7 +3,7 @@ The arraypad module contains a group of functions to pad values onto the edges of an n-dimensional array. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index e3a39342f..a8b0a95bb 100644 --- a/numpy/lib/arraysetops.py +++ b/numpy/lib/arraysetops.py @@ -24,7 +24,7 @@ To do: Optionally return indices analogously to unique for all functions. :Author: Robert Cimrman """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['ediff1d', 'intersect1d', 'setxor1d', 'union1d', 'setdiff1d', 'unique', 'in1d'] diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py index b71e9a123..856c4633a 100644 --- a/numpy/lib/arrayterator.py +++ b/numpy/lib/arrayterator.py @@ -7,7 +7,7 @@ an array object, and when iterated it will return sub-arrays with at most a user-specified number of elements. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from operator import mul diff --git a/numpy/lib/financial.py b/numpy/lib/financial.py index 2a3295bfe..28e63f52b 100644 --- a/numpy/lib/financial.py +++ b/numpy/lib/financial.py @@ -8,7 +8,7 @@ broadcasting and being able to be called with scalars or arrays (or other sequences). """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np diff --git a/numpy/lib/format.py b/numpy/lib/format.py index b41588d6b..93d20fa4c 100644 --- a/numpy/lib/format.py +++ b/numpy/lib/format.py @@ -134,7 +134,7 @@ The ``.npy`` format, including reasons for creating it and a comparison of alternatives, is described fully in the "npy-format" NEP. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy import sys diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index fdcb4977a..1e5a822a7 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __docformat__ = "restructuredtext en" __all__ = ['select', 'piecewise', 'trim_zeros', 'copy', 'iterable', diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 06ec80d23..41a891a39 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['ravel_multi_index', 'unravel_index', diff --git a/numpy/lib/info.py b/numpy/lib/info.py index de94f0a19..94eeae503 100644 --- a/numpy/lib/info.py +++ b/numpy/lib/info.py @@ -145,7 +145,7 @@ setdiff1d Set difference of 1D arrays with unique elements. ================ =================== """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function depends = ['core','testing'] global_symbols = ['*'] diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index 2cd375ef9..14d41a3c1 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from . import format diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py index 3f5593432..e61a89b87 100644 --- a/numpy/lib/polynomial.py +++ b/numpy/lib/polynomial.py @@ -2,7 +2,7 @@ Functions to operate on polynomials. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd', 'polysub', 'polymul', 'polydiv', 'polyval', 'poly1d', diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index 9f0beff59..b96186bbd 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -5,7 +5,7 @@ Most of these functions were initially implemented by John Hunter for matplotlib They have been rewritten and extended for convenience. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import itertools diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py index 0457e120c..2aa08d0ea 100644 --- a/numpy/lib/scimath.py +++ b/numpy/lib/scimath.py @@ -15,7 +15,7 @@ Similarly, `sqrt`, other base logarithms, `power` and trig functions are correctly handled. See their respective docstrings for specific examples. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['sqrt', 'log', 'log2', 'logn','log10', 'power', 'arccos', 'arcsin', 'arctanh'] diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py index e69c8c4fa..edc653f9f 100644 --- a/numpy/lib/setup.py +++ b/numpy/lib/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function from os.path import join diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index 4f14a0c40..631cf6820 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['column_stack','row_stack', 'dstack','array_split','split','hsplit', 'vsplit','dsplit','apply_over_axes','expand_dims', diff --git a/numpy/lib/stride_tricks.py b/numpy/lib/stride_tricks.py index 70457c19f..5c9d222f3 100644 --- a/numpy/lib/stride_tricks.py +++ b/numpy/lib/stride_tricks.py @@ -5,7 +5,7 @@ An explanation of strides can be found in the "ndarray.rst" file in the NumPy reference guide. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np diff --git a/numpy/lib/tests/test__datasource.py b/numpy/lib/tests/test__datasource.py index ccd7405fe..beb252186 100644 --- a/numpy/lib/tests/test__datasource.py +++ b/numpy/lib/tests/test__datasource.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import urllib2 diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py index 1cd9a25da..63d0ac2ef 100644 --- a/numpy/lib/tests/test__iotools.py +++ b/numpy/lib/tests/test__iotools.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import time diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py index 0a87acb36..041d7e6e0 100644 --- a/numpy/lib/tests/test_arraypad.py +++ b/numpy/lib/tests/test_arraypad.py @@ -1,7 +1,7 @@ """Tests for the pad functions. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import TestCase, run_module_suite, assert_array_equal from numpy.testing import assert_raises, assert_array_almost_equal diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py index b0a2e429d..b3c608cf8 100644 --- a/numpy/lib/tests/test_arraysetops.py +++ b/numpy/lib/tests/test_arraysetops.py @@ -1,7 +1,7 @@ """Test functions for 1D array set operations. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy as np diff --git a/numpy/lib/tests/test_arrayterator.py b/numpy/lib/tests/test_arrayterator.py index 28feb4824..197d863f4 100644 --- a/numpy/lib/tests/test_arrayterator.py +++ b/numpy/lib/tests/test_arrayterator.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from operator import mul diff --git a/numpy/lib/tests/test_financial.py b/numpy/lib/tests/test_financial.py index 56681dbb4..d76948582 100644 --- a/numpy/lib/tests/test_financial.py +++ b/numpy/lib/tests/test_financial.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy as np diff --git a/numpy/lib/tests/test_format.py b/numpy/lib/tests/test_format.py index aae3b1ba8..8b809891f 100644 --- a/numpy/lib/tests/test_format.py +++ b/numpy/lib/tests/test_format.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function r''' Test the .npy file format. diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index 406bad40b..28786dc3e 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings import numpy as np diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index 02516cab7..32b3c7036 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy as np diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py index 6b5173890..43739c53c 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import gzip diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py index 4a110d58e..fa166b7f1 100644 --- a/numpy/lib/tests/test_polynomial.py +++ b/numpy/lib/tests/test_polynomial.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function ''' >>> p = np.poly1d([1.,2,3]) diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py index f38a6914c..899031451 100644 --- a/numpy/lib/tests/test_recfunctions.py +++ b/numpy/lib/tests/test_recfunctions.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index 2e76b320c..3b70d1ff0 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py index 9aaf3d086..3c270088f 100644 --- a/numpy/lib/tests/test_shape_base.py +++ b/numpy/lib/tests/test_shape_base.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy.lib import * diff --git a/numpy/lib/tests/test_stride_tricks.py b/numpy/lib/tests/test_stride_tricks.py index b6408fe19..f815b247f 100644 --- a/numpy/lib/tests/test_stride_tricks.py +++ b/numpy/lib/tests/test_stride_tricks.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import * diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py index e2d24464a..7e590c1db 100644 --- a/numpy/lib/tests/test_twodim_base.py +++ b/numpy/lib/tests/test_twodim_base.py @@ -1,7 +1,7 @@ """Test functions for matrix module """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py index c1204cec4..280d0b174 100644 --- a/numpy/lib/tests/test_type_check.py +++ b/numpy/lib/tests/test_type_check.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy.lib import * diff --git a/numpy/lib/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py index d4505266c..50f3229e8 100644 --- a/numpy/lib/tests/test_ufunclike.py +++ b/numpy/lib/tests/test_ufunclike.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy.core as nx diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py index 8cec1887b..4062d35b5 100644 --- a/numpy/lib/tests/test_utils.py +++ b/numpy/lib/tests/test_utils.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index b2e74e07a..94dfbe796 100644 --- a/numpy/lib/twodim_base.py +++ b/numpy/lib/twodim_base.py @@ -1,7 +1,7 @@ """ Basic functions for manipulating 2d arrays """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['diag','diagflat','eye','fliplr','flipud','rot90','tri','triu', 'tril','vander','histogram2d','mask_indices', diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py index b59cf13aa..6e0cfcddb 100644 --- a/numpy/lib/type_check.py +++ b/numpy/lib/type_check.py @@ -1,7 +1,7 @@ """Automatically adapted for numpy Sep 19, 2005 by convertcode.py """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['iscomplexobj','isrealobj','imag','iscomplex', 'isreal','nan_to_num','real','real_if_close', diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py index a71dab0d0..e91f64d0e 100644 --- a/numpy/lib/ufunclike.py +++ b/numpy/lib/ufunclike.py @@ -3,7 +3,7 @@ Module of functions that are like ufuncs in acting on arrays and optionally storing results in an output array. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['fix', 'isneginf', 'isposinf'] diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py index e6871f489..1cc1345aa 100644 --- a/numpy/lib/user_array.py +++ b/numpy/lib/user_array.py @@ -4,7 +4,7 @@ Try to inherit from the ndarray instead of using this class as this is not complete. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.core import array, asarray, absolute, add, subtract, multiply, \ divide, remainder, power, left_shift, right_shift, bitwise_and, \ @@ -205,15 +205,15 @@ if __name__ == '__main__': ua=container(temp) # new object created begin test - print dir(ua) - print shape(ua),ua.shape # I have changed Numeric.py + print(dir(ua)) + print(shape(ua),ua.shape) # I have changed Numeric.py ua_small=ua[:3,:5] - print ua_small + print(ua_small) ua_small[0,0]=10 # this did not change ua[0,0], which is not normal behavior - print ua_small[0,0],ua[0,0] - print sin(ua_small)/3.*6.+sqrt(ua_small**2) - print less(ua_small,103),type(less(ua_small,103)) - print type(ua_small*reshape(arange(15),shape(ua_small))) - print reshape(ua_small,(5,3)) - print transpose(ua_small) + print(ua_small[0,0],ua[0,0]) + print(sin(ua_small)/3.*6.+sqrt(ua_small**2)) + print(less(ua_small,103),type(less(ua_small,103))) + print(type(ua_small*reshape(arange(15),shape(ua_small)))) + print(reshape(ua_small,(5,3))) + print(transpose(ua_small)) diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index c4b692a69..4ed534455 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -393,15 +393,15 @@ def who(vardict=None): sp2 = max(10,maxshape) sp3 = max(10,maxbyte) prval = "Name %s Shape %s Bytes %s Type" % (sp1*' ', sp2*' ', sp3*' ') - print prval + "\n" + "="*(len(prval)+5) + "\n" + print(prval + "\n" + "="*(len(prval)+5) + "\n") for k in range(len(sta)): val = sta[k] - print "%s %s %s %s %s %s %s" % (val[0], ' '*(sp1-len(val[0])+4), + print("%s %s %s %s %s %s %s" % (val[0], ' '*(sp1-len(val[0])+4), val[1], ' '*(sp2-len(val[1])+5), val[2], ' '*(sp3-len(val[2])+5), - val[3]) - print "\nUpper bound on total bytes = %d" % totalbytes + val[3])) + print("\nUpper bound on total bytes = %d" % totalbytes) return #----------------------------------------------------------------------------- @@ -528,19 +528,19 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): try: obj = _namedict[namestr][object] if id(obj) in objlist: - print >> output, "\n *** Repeat reference found in %s *** " % namestr + print("\n *** Repeat reference found in %s *** " % namestr, file=output) else: objlist.append(id(obj)) - print >> output, " *** Found in %s ***" % namestr + print(" *** Found in %s ***" % namestr, file=output) info(obj) - print >> output, "-"*maxwidth + print("-"*maxwidth, file=output) numfound += 1 except KeyError: pass if numfound == 0: - print >> output, "Help for %s not found." % object + print("Help for %s not found." % object, file=output) else: - print >> output, "\n *** Total of %d references found. ***" % numfound + print("\n *** Total of %d references found. ***" % numfound, file=output) elif inspect.isfunction(object): name = object.__name__ @@ -551,8 +551,8 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): else: argstr = name + arguments - print >> output, " " + argstr + "\n" - print >> output, inspect.getdoc(object) + print(" " + argstr + "\n", file=output) + print(inspect.getdoc(object), file=output) elif inspect.isclass(object): name = object.__name__ @@ -572,28 +572,28 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): else: argstr = name + arguments - print >> output, " " + argstr + "\n" + print(" " + argstr + "\n", file=output) doc1 = inspect.getdoc(object) if doc1 is None: if hasattr(object,'__init__'): - print >> output, inspect.getdoc(object.__init__) + print(inspect.getdoc(object.__init__), file=output) else: - print >> output, inspect.getdoc(object) + print(inspect.getdoc(object), file=output) methods = pydoc.allmethods(object) if methods != []: - print >> output, "\n\nMethods:\n" + print("\n\nMethods:\n", file=output) for meth in methods: if meth[0] == '_': continue thisobj = getattr(object, meth, None) if thisobj is not None: methstr, other = pydoc.splitdoc(inspect.getdoc(thisobj) or "None") - print >> output, " %s -- %s" % (meth, methstr) + print(" %s -- %s" % (meth, methstr), file=output) elif type(object) is types.InstanceType: ## check for __call__ method - print >> output, "Instance of class: ", object.__class__.__name__ - print >> output + print("Instance of class: ", object.__class__.__name__, file=output) + print(file=output) if hasattr(object, '__call__'): arguments = inspect.formatargspec(*inspect.getargspec(object.__call__.__func__)) arglist = arguments.split(', ') @@ -612,14 +612,14 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): else: argstr = name + arguments - print >> output, " " + argstr + "\n" + print(" " + argstr + "\n", file=output) doc = inspect.getdoc(object.__call__) if doc is not None: - print >> output, inspect.getdoc(object.__call__) - print >> output, inspect.getdoc(object) + print(inspect.getdoc(object.__call__), file=output) + print(inspect.getdoc(object), file=output) else: - print >> output, inspect.getdoc(object) + print(inspect.getdoc(object), file=output) elif inspect.ismethod(object): name = object.__name__ @@ -636,11 +636,11 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): else: argstr = name + arguments - print >> output, " " + argstr + "\n" - print >> output, inspect.getdoc(object) + print(" " + argstr + "\n", file=output) + print(inspect.getdoc(object), file=output) elif hasattr(object, '__doc__'): - print >> output, inspect.getdoc(object) + print(inspect.getdoc(object), file=output) def source(object, output=sys.stdout): @@ -684,10 +684,10 @@ def source(object, output=sys.stdout): # Local import to speed up numpy's import time. import inspect try: - print >> output, "In file: %s\n" % inspect.getsourcefile(object) - print >> output, inspect.getsource(object) + print("In file: %s\n" % inspect.getsourcefile(object), file=output) + print(inspect.getsource(object), file=output) except: - print >> output, "Not available for this object." + print("Not available for this object.", file=output) # Cache for lookfor: {id(module): {name: (docstring, kind, index), ...}...} @@ -823,7 +823,7 @@ def lookfor(what, module=None, import_modules=True, regenerate=False, pager = pydoc.getpager() pager("\n".join(help_text)) else: - print "\n".join(help_text) + print("\n".join(help_text)) def _lookfor_generate_cache(module, import_modules, regenerate): """ diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py index d0a5de983..2513e35c0 100644 --- a/numpy/linalg/__init__.py +++ b/numpy/linalg/__init__.py @@ -42,7 +42,7 @@ LinAlgError Indicates a failed linear algebra operation =============== ========================================================== """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # To get sub-modules from .info import __doc__ diff --git a/numpy/linalg/info.py b/numpy/linalg/info.py index 14d9ab1f7..646ecda04 100644 --- a/numpy/linalg/info.py +++ b/numpy/linalg/info.py @@ -32,6 +32,6 @@ Exceptions: - LinAlgError Indicates a failed linear algebra operation """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function depends = ['core'] diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py index e6ac43e31..f8471f965 100644 --- a/numpy/linalg/lapack_lite/clapack_scrub.py +++ b/numpy/linalg/lapack_lite/clapack_scrub.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, os from io import StringIO @@ -252,7 +252,7 @@ def scrubSource(source, nsteps=None, verbose=False): for msg, step in steps: if verbose: - print msg + print(msg) source = step(source) return source diff --git a/numpy/linalg/lapack_lite/fortran.py b/numpy/linalg/lapack_lite/fortran.py index 6aad0ba8c..ce63b0990 100644 --- a/numpy/linalg/lapack_lite/fortran.py +++ b/numpy/linalg/lapack_lite/fortran.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import itertools diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py index 7e48a5a37..6f5064e27 100755 --- a/numpy/linalg/lapack_lite/make_lite.py +++ b/numpy/linalg/lapack_lite/make_lite.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, os import fortran @@ -156,9 +156,9 @@ class LapackLibrary(FortranLibrary): return [a[1] for a in routines] def printRoutineNames(desc, routines): - print desc + print(desc) for r in routines: - print '\t%s' % r.name + print('\t%s' % r.name) def getLapackRoutines(wrapped_routines, ignores, lapack_dir): blas_src_dir = os.path.join(lapack_dir, 'BLAS', 'SRC') @@ -236,8 +236,8 @@ def scrubF2CSource(c_file): def main(): if len(sys.argv) != 4: - print 'Usage: %s wrapped_routines_file lapack_dir output_dir' % \ - (sys.argv[0],) + print('Usage: %s wrapped_routines_file lapack_dir output_dir' % \ + (sys.argv[0],)) return wrapped_routines_file = sys.argv[1] lapack_src_dir = sys.argv[2] @@ -249,7 +249,7 @@ def main(): dumpRoutineNames(library, output_dir) for typename in ['blas', 'dlapack', 'zlapack']: - print 'creating %s_lite.c ...' % typename + print('creating %s_lite.c ...' % typename) routines = library.allRoutinesByType(typename) fortran_file = os.path.join(output_dir, typename+'_lite.f') c_file = fortran_file[:-2] + '.c' @@ -257,7 +257,7 @@ def main(): try: runF2C(fortran_file, output_dir) except F2CError: - print 'f2c failed on %s' % fortran_file + print('f2c failed on %s' % fortran_file) break scrubF2CSource(c_file) diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index ba242e7c6..34fe9b550 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -8,7 +8,7 @@ version only accesses the following LAPACK functions: dgesv, zgesv, dgeev, zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, zgetrf, dpotrf, zpotrf, dgeqrf, zgeqrf, zungqr, dorgqr. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['matrix_power', 'solve', 'tensorsolve', 'tensorinv', 'inv', diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py index 40e9c0dec..21181dcb5 100644 --- a/numpy/linalg/setup.py +++ b/numpy/linalg/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import sys diff --git a/numpy/linalg/tests/test_build.py b/numpy/linalg/tests/test_build.py index 0e7dc3629..27fbd6429 100644 --- a/numpy/linalg/tests/test_build.py +++ b/numpy/linalg/tests/test_build.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from subprocess import call, PIPE, Popen import sys diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py index 3f2d438f7..d31da3220 100644 --- a/numpy/linalg/tests/test_linalg.py +++ b/numpy/linalg/tests/test_linalg.py @@ -1,6 +1,6 @@ """ Test functions for linalg module """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py index c3e01c383..76fe4be10 100644 --- a/numpy/linalg/tests/test_regression.py +++ b/numpy/linalg/tests/test_regression.py @@ -1,6 +1,6 @@ """ Test functions for linalg module """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/ma/__init__.py b/numpy/ma/__init__.py index 3113e538c..0cb92f667 100644 --- a/numpy/ma/__init__.py +++ b/numpy/ma/__init__.py @@ -36,7 +36,7 @@ may now proceed to calculate the mean of the other values: invalid operation. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = '1.0' diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py index 7500245c3..b8d085130 100644 --- a/numpy/ma/bench.py +++ b/numpy/ma/bench.py @@ -1,6 +1,6 @@ #! python # encoding: utf-8 -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import timeit #import IPython.ipapi @@ -42,7 +42,7 @@ nmzl = numpy.ma.array(zl, mask=maskx) def timer(s, v='', nloop=500, nrep=3): units = ["s", "ms", "µs", "ns"] scaling = [1, 1e3, 1e6, 1e9] - print "%s : %-50s : " % (v,s), + print("%s : %-50s : " % (v,s), end=' ') varnames = ["%ss,nm%ss,%sl,nm%sl" % tuple(x*4) for x in 'xyz'] setup = 'from __main__ import numpy, ma, %s' % ','.join(varnames) Timer = timeit.Timer(stmt=s, setup=setup) @@ -51,10 +51,10 @@ def timer(s, v='', nloop=500, nrep=3): order = min(-int(numpy.floor(numpy.log10(best)) // 3), 3) else: order = 3 - print "%d loops, best of %d: %.*g %s per loop" % (nloop, nrep, + print("%d loops, best of %d: %.*g %s per loop" % (nloop, nrep, 3, best * scaling[order], - units[order]) + units[order])) # ip.magic('timeit -n%i %s' % (nloop,s)) @@ -62,24 +62,24 @@ def timer(s, v='', nloop=500, nrep=3): def compare_functions_1v(func, nloop=500, xs=xs, nmxs=nmxs, xl=xl, nmxl=nmxl): funcname = func.__name__ - print "-"*50 - print "%s on small arrays" % funcname + print("-"*50) + print("%s on small arrays" % funcname) module, data = "numpy.ma","nmxs" timer("%(module)s.%(funcname)s(%(data)s)" % locals(), v="%11s" % module, nloop=nloop) # - print "%s on large arrays" % funcname + print("%s on large arrays" % funcname) module, data = "numpy.ma","nmxl" timer("%(module)s.%(funcname)s(%(data)s)" % locals(), v="%11s" % module, nloop=nloop) return def compare_methods(methodname, args, vars='x', nloop=500, test=True, xs=xs, nmxs=nmxs, xl=xl, nmxl=nmxl): - print "-"*50 - print "%s on small arrays" % methodname + print("-"*50) + print("%s on small arrays" % methodname) data, ver = "nm%ss" % vars, 'numpy.ma' timer("%(data)s.%(methodname)s(%(args)s)" % locals(), v=ver, nloop=nloop) # - print "%s on large arrays" % methodname + print("%s on large arrays" % methodname) data, ver = "nm%sl" % vars, 'numpy.ma' timer("%(data)s.%(methodname)s(%(args)s)" % locals(), v=ver, nloop=nloop) return @@ -90,12 +90,12 @@ def compare_functions_2v(func, nloop=500, test=True, xl=xl, nmxl=nmxl, yl=yl, nmyl=nmyl): funcname = func.__name__ - print "-"*50 - print "%s on small arrays" % funcname + print("-"*50) + print("%s on small arrays" % funcname) module, data = "numpy.ma","nmxs,nmys" timer("%(module)s.%(funcname)s(%(data)s)" % locals(), v="%11s" % module, nloop=nloop) # - print "%s on large arrays" % funcname + print("%s on large arrays" % funcname) module, data = "numpy.ma","nmxl,nmyl" timer("%(module)s.%(funcname)s(%(data)s)" % locals(), v="%11s" % module, nloop=nloop) return @@ -149,18 +149,18 @@ if __name__ == '__main__': compare_methods('__setitem__','0, 17', nloop=1000, test=False) compare_methods('__setitem__','(0,0), 17', nloop=1000, test=False) #.................................................................... - print "-"*50 - print "__setitem__ on small arrays" + print("-"*50) + print("__setitem__ on small arrays") timer('nmxs.__setitem__((-1,0),numpy.ma.masked)', 'numpy.ma ',nloop=10000) - print "-"*50 - print "__setitem__ on large arrays" + print("-"*50) + print("__setitem__ on large arrays") timer('nmxl.__setitem__((-1,0),numpy.ma.masked)', 'numpy.ma ',nloop=10000) #.................................................................... - print "-"*50 - print "where on small arrays" + print("-"*50) + print("where on small arrays") timer('numpy.ma.where(nmxs>2,nmxs,nmys)', 'numpy.ma ',nloop=1000) - print "-"*50 - print "where on large arrays" + print("-"*50) + print("where on large arrays") timer('numpy.ma.where(nmxl>2,nmxl,nmyl)', 'numpy.ma ',nloop=100) diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 64cfafe7c..dbabc37ac 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -20,7 +20,7 @@ Released for unlimited redistribution. """ # pylint: disable-msg=E1002 -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import warnings diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index a22152729..a809db53c 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -8,7 +8,7 @@ A collection of utilities for `numpy.ma`. :version: $Id: extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = '1.0' diff --git a/numpy/ma/mrecords.py b/numpy/ma/mrecords.py index ae31986bc..942b4fe81 100644 --- a/numpy/ma/mrecords.py +++ b/numpy/ma/mrecords.py @@ -8,7 +8,7 @@ and the masking of individual fields. :author: Pierre Gerard-Marchant """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function #!!!: * We should make sure that no field is called '_mask','mask','_fieldmask', #!!!: or whatever restricted keywords. diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py index 2191d23f4..2175628d6 100644 --- a/numpy/ma/setup.py +++ b/numpy/ma/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = '1.0' diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index 7eb4bbed2..d2f1bb6b9 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -4,7 +4,7 @@ :author: Pierre Gerard-Marchant :contact: pierregm_at_uga_dot_edu """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant" diff --git a/numpy/ma/tests/test_extras.py b/numpy/ma/tests/test_extras.py index c32e689c3..b6643fc4d 100644 --- a/numpy/ma/tests/test_extras.py +++ b/numpy/ma/tests/test_extras.py @@ -7,7 +7,7 @@ Adapted from the original test_ma by Pierre Gerard-Marchant :version: $Id: test_extras.py 3473 2007-10-29 15:18:13Z jarrod.millman $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = '1.0' diff --git a/numpy/ma/tests/test_mrecords.py b/numpy/ma/tests/test_mrecords.py index 3b9296a04..515263fb2 100644 --- a/numpy/ma/tests/test_mrecords.py +++ b/numpy/ma/tests/test_mrecords.py @@ -5,7 +5,7 @@ :contact: pierregm_at_uga_dot_edu """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import warnings diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py index 41f7779d9..64d3ec683 100644 --- a/numpy/ma/tests/test_old_ma.py +++ b/numpy/ma/tests/test_old_ma.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy import types @@ -15,10 +15,10 @@ pi = numpy.pi def eq(v, w, msg=''): result = allclose(v, w) if not result: - print """Not eq:%s + print("""Not eq:%s %s ---- -%s""" % (msg, str(v), str(w)) +%s""" % (msg, str(v), str(w))) return result class TestMa(TestCase): diff --git a/numpy/ma/tests/test_regression.py b/numpy/ma/tests/test_regression.py index e5fea0c52..917c53969 100644 --- a/numpy/ma/tests/test_regression.py +++ b/numpy/ma/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy as np diff --git a/numpy/ma/tests/test_subclassing.py b/numpy/ma/tests/test_subclassing.py index 6b8ff0769..ab0caf96b 100644 --- a/numpy/ma/tests/test_subclassing.py +++ b/numpy/ma/tests/test_subclassing.py @@ -6,7 +6,7 @@ :version: $Id: test_subclassing.py 3473 2007-10-29 15:18:13Z jarrod.millman $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = '1.0' diff --git a/numpy/ma/testutils.py b/numpy/ma/testutils.py index 882db2b89..feff3e879 100644 --- a/numpy/ma/testutils.py +++ b/numpy/ma/testutils.py @@ -5,7 +5,7 @@ :version: $Id: testutils.py 3529 2007-11-13 08:01:14Z jarrod.millman $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __author__ = "Pierre GF Gerard-Marchant ($Author: jarrod.millman $)" __version__ = "1.0" diff --git a/numpy/ma/timer_comparison.py b/numpy/ma/timer_comparison.py index 549448689..80a93c53b 100644 --- a/numpy/ma/timer_comparison.py +++ b/numpy/ma/timer_comparison.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import timeit @@ -452,9 +452,9 @@ if __name__ == '__main__': cur = np.sort(cur) # alt = np.sort(alt) # tmp = np.sort(tmp) - print "#%i" % i +50*'.' - print eval("moduletester.test_%i.__doc__" % i) + print("#%i" % i +50*'.') + print(eval("moduletester.test_%i.__doc__" % i)) # print "core_ini : %.3f - %.3f" % (new[0], new[1]) - print "core_current : %.3f - %.3f" % (cur[0], cur[1]) + print("core_current : %.3f - %.3f" % (cur[0], cur[1])) # print "core_alt : %.3f - %.3f" % (alt[0], alt[1]) # print "core_tmp : %.3f - %.3f" % (tmp[0], tmp[1]) diff --git a/numpy/ma/version.py b/numpy/ma/version.py index cf9a95572..a2c5c42a8 100644 --- a/numpy/ma/version.py +++ b/numpy/ma/version.py @@ -1,7 +1,7 @@ """Version number """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function version = '1.00' release = False diff --git a/numpy/matlib.py b/numpy/matlib.py index df683573f..5a1ebe14a 100644 --- a/numpy/matlib.py +++ b/numpy/matlib.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.matrixlib.defmatrix import matrix, asmatrix diff --git a/numpy/matrixlib/__init__.py b/numpy/matrixlib/__init__.py index bb826cd39..d20696154 100644 --- a/numpy/matrixlib/__init__.py +++ b/numpy/matrixlib/__init__.py @@ -1,7 +1,7 @@ """Sub-package containing the matrix class and related functions. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .defmatrix import * diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index 4ecce483c..70f5683ff 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['matrix', 'bmat', 'mat', 'asmatrix'] diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py index 539e62a7f..8c383cece 100644 --- a/numpy/matrixlib/setup.py +++ b/numpy/matrixlib/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function import os diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index c67b447b8..bc2b747e7 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy.core import * diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py index d58adb3a2..bed055615 100644 --- a/numpy/matrixlib/tests/test_multiarray.py +++ b/numpy/matrixlib/tests/test_multiarray.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import * diff --git a/numpy/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py index 7b690fbef..940bfc5d9 100644 --- a/numpy/matrixlib/tests/test_numeric.py +++ b/numpy/matrixlib/tests/test_numeric.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import assert_equal, TestCase from numpy.core import ones diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py index da5131bc6..27cff2c21 100644 --- a/numpy/matrixlib/tests/test_regression.py +++ b/numpy/matrixlib/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * import numpy as np diff --git a/numpy/numarray/__init__.py b/numpy/numarray/__init__.py index f7a487cdf..706ec1c33 100644 --- a/numpy/numarray/__init__.py +++ b/numpy/numarray/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .util import * from .numerictypes import * diff --git a/numpy/numarray/alter_code1.py b/numpy/numarray/alter_code1.py index 09370549d..4c5b7e9fc 100644 --- a/numpy/numarray/alter_code1.py +++ b/numpy/numarray/alter_code1.py @@ -52,7 +52,7 @@ Makes the following changes: - .setimaginary() --> .imag """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc'] diff --git a/numpy/numarray/alter_code2.py b/numpy/numarray/alter_code2.py index df248a924..18c604afb 100644 --- a/numpy/numarray/alter_code2.py +++ b/numpy/numarray/alter_code2.py @@ -5,7 +5,7 @@ with numpy FIXME: finish this. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = [] diff --git a/numpy/numarray/compat.py b/numpy/numarray/compat.py index 24e20be17..2289af04c 100644 --- a/numpy/numarray/compat.py +++ b/numpy/numarray/compat.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['NewAxis', 'ArrayType'] diff --git a/numpy/numarray/convolve.py b/numpy/numarray/convolve.py index af7330fc7..b2ff3bd13 100644 --- a/numpy/numarray/convolve.py +++ b/numpy/numarray/convolve.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function try: from stsci.convolve import * diff --git a/numpy/numarray/fft.py b/numpy/numarray/fft.py index 4adf1d3bb..407ad7c5b 100644 --- a/numpy/numarray/fft.py +++ b/numpy/numarray/fft.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.oldnumeric.fft import * import numpy.oldnumeric.fft as nof diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 9da96009f..9b72a27e2 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # missing Numarray defined names (in from numarray import *) @@ -362,47 +362,47 @@ def info(obj, output=sys.stdout, numpy=0): nm = getattr(cls, '__name__', cls) else: nm = cls - print >> output, "class: ", nm - print >> output, "shape: ", obj.shape + print("class: ", nm, file=output) + print("shape: ", obj.shape, file=output) strides = obj.strides - print >> output, "strides: ", strides + print("strides: ", strides, file=output) if not numpy: - print >> output, "byteoffset: 0" + print("byteoffset: 0", file=output) if len(strides) > 0: bs = obj.strides[0] else: bs = obj.itemsize - print >> output, "bytestride: ", bs - print >> output, "itemsize: ", obj.itemsize - print >> output, "aligned: ", bp(obj.flags.aligned) - print >> output, "contiguous: ", bp(obj.flags.contiguous) + print("bytestride: ", bs, file=output) + print("itemsize: ", obj.itemsize, file=output) + print("aligned: ", bp(obj.flags.aligned), file=output) + print("contiguous: ", bp(obj.flags.contiguous), file=output) if numpy: - print >> output, "fortran: ", obj.flags.fortran + print("fortran: ", obj.flags.fortran, file=output) if not numpy: - print >> output, "buffer: ", repr(obj.data) + print("buffer: ", repr(obj.data), file=output) if not numpy: extra = " (DEBUG ONLY)" tic = "'" else: extra = "" tic = "" - print >> output, "data pointer: %s%s" % (hex(obj.ctypes._as_parameter_.value), extra) - print >> output, "byteorder: ", + print("data pointer: %s%s" % (hex(obj.ctypes._as_parameter_.value), extra), file=output) + print("byteorder: ", end=' ', file=output) endian = obj.dtype.byteorder if endian in ['|','=']: - print >> output, "%s%s%s" % (tic, sys.byteorder, tic) + print("%s%s%s" % (tic, sys.byteorder, tic), file=output) byteswap = False elif endian == '>': - print >> output, "%sbig%s" % (tic, tic) + print("%sbig%s" % (tic, tic), file=output) byteswap = sys.byteorder != "big" else: - print >> output, "%slittle%s" % (tic, tic) + print("%slittle%s" % (tic, tic), file=output) byteswap = sys.byteorder != "little" - print >> output, "byteswap: ", bp(byteswap) + print("byteswap: ", bp(byteswap), file=output) if not numpy: - print >> output, "type: ", typefrom(obj).name + print("type: ", typefrom(obj).name, file=output) else: - print >> output, "type: %s" % obj.dtype + print("type: %s" % obj.dtype, file=output) #clipmode is ignored if axis is not 0 and array is not 1d def put(array, indices, values, axis=0, clipmode=RAISE): diff --git a/numpy/numarray/image.py b/numpy/numarray/image.py index bcfa09afd..063e51376 100644 --- a/numpy/numarray/image.py +++ b/numpy/numarray/image.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function try: from stsci.image import * diff --git a/numpy/numarray/linear_algebra.py b/numpy/numarray/linear_algebra.py index 3b92d09d1..6cf22329e 100644 --- a/numpy/numarray/linear_algebra.py +++ b/numpy/numarray/linear_algebra.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.oldnumeric.linear_algebra import * diff --git a/numpy/numarray/ma.py b/numpy/numarray/ma.py index f220362ae..dbfd3d2f5 100644 --- a/numpy/numarray/ma.py +++ b/numpy/numarray/ma.py @@ -1,3 +1,3 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.oldnumeric.ma import * diff --git a/numpy/numarray/matrix.py b/numpy/numarray/matrix.py index bd10f8278..e88fc086f 100644 --- a/numpy/numarray/matrix.py +++ b/numpy/numarray/matrix.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['Matrix'] diff --git a/numpy/numarray/mlab.py b/numpy/numarray/mlab.py index d530c8a05..c5b9194ee 100644 --- a/numpy/numarray/mlab.py +++ b/numpy/numarray/mlab.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.oldnumeric.mlab import * import numpy.oldnumeric.mlab as nom diff --git a/numpy/numarray/nd_image.py b/numpy/numarray/nd_image.py index d73788ed3..224d2ba23 100644 --- a/numpy/numarray/nd_image.py +++ b/numpy/numarray/nd_image.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function try: from ndimage import * diff --git a/numpy/numarray/numerictypes.py b/numpy/numarray/numerictypes.py index b51706ec3..caf40cf45 100644 --- a/numpy/numarray/numerictypes.py +++ b/numpy/numarray/numerictypes.py @@ -27,7 +27,7 @@ Exported symbols include: $Id: numerictypes.py,v 1.55 2005/12/01 16:22:03 jaytmiller Exp $ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['NumericType','HasUInt64','typeDict','IsType', diff --git a/numpy/numarray/random_array.py b/numpy/numarray/random_array.py index 6f56e9cf9..2edb171a2 100644 --- a/numpy/numarray/random_array.py +++ b/numpy/numarray/random_array.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['ArgumentError', 'F', 'beta', 'binomial', 'chi_square', 'exponential', 'gamma', 'get_seed', 'multinomial', diff --git a/numpy/numarray/session.py b/numpy/numarray/session.py index 32a28cca0..818c57bc8 100644 --- a/numpy/numarray/session.py +++ b/numpy/numarray/session.py @@ -72,7 +72,7 @@ Saved modules are re-imported at load time but any "state" in the module which is not restored by a simple import is lost. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['load', 'save'] @@ -126,8 +126,8 @@ def _callers_modules(): def _errout(*args): for a in args: - print >>sys.stderr, a, - print >>sys.stderr + print(a, end=' ', file=sys.stderr) + print(file=sys.stderr) def _verbose(*args): if VERBOSE: diff --git a/numpy/numarray/setup.py b/numpy/numarray/setup.py index ab3f2a4d5..5c9574917 100644 --- a/numpy/numarray/setup.py +++ b/numpy/numarray/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function from os.path import join diff --git a/numpy/numarray/ufuncs.py b/numpy/numarray/ufuncs.py index a5b72c3fb..57fc58c54 100644 --- a/numpy/numarray/ufuncs.py +++ b/numpy/numarray/ufuncs.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_not', diff --git a/numpy/numarray/util.py b/numpy/numarray/util.py index acdb18fc8..b8e37a28d 100644 --- a/numpy/numarray/util.py +++ b/numpy/numarray/util.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import numpy as np @@ -23,22 +23,22 @@ def handleError(errorStatus, sourcemsg): modes = np.geterr() if errorStatus & np.FPE_INVALID: if modes['invalid'] == "warn": - print "Warning: Encountered invalid numeric result(s)", sourcemsg + print("Warning: Encountered invalid numeric result(s)", sourcemsg) if modes['invalid'] == "raise": raise MathDomainError(sourcemsg) if errorStatus & np.FPE_DIVIDEBYZERO: if modes['dividebyzero'] == "warn": - print "Warning: Encountered divide by zero(s)", sourcemsg + print("Warning: Encountered divide by zero(s)", sourcemsg) if modes['dividebyzero'] == "raise": raise ZeroDivisionError(sourcemsg) if errorStatus & np.FPE_OVERFLOW: if modes['overflow'] == "warn": - print "Warning: Encountered overflow(s)", sourcemsg + print("Warning: Encountered overflow(s)", sourcemsg) if modes['overflow'] == "raise": raise NumOverflowError(sourcemsg) if errorStatus & np.FPE_UNDERFLOW: if modes['underflow'] == "warn": - print "Warning: Encountered underflow(s)", sourcemsg + print("Warning: Encountered underflow(s)", sourcemsg) if modes['underflow'] == "raise": raise UnderflowError(sourcemsg) diff --git a/numpy/oldnumeric/__init__.py b/numpy/oldnumeric/__init__.py index ff8c00885..cf34b8300 100644 --- a/numpy/oldnumeric/__init__.py +++ b/numpy/oldnumeric/__init__.py @@ -1,7 +1,7 @@ """Don't add these to the __all__ variable though """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy import * diff --git a/numpy/oldnumeric/alter_code1.py b/numpy/oldnumeric/alter_code1.py index f970994e4..1e84fd894 100644 --- a/numpy/oldnumeric/alter_code1.py +++ b/numpy/oldnumeric/alter_code1.py @@ -29,7 +29,7 @@ Makes the following changes: isinstance(..., <type>) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc'] diff --git a/numpy/oldnumeric/alter_code2.py b/numpy/oldnumeric/alter_code2.py index 6d33efd60..4e4d94cd6 100644 --- a/numpy/oldnumeric/alter_code2.py +++ b/numpy/oldnumeric/alter_code2.py @@ -19,7 +19,7 @@ Makes the following changes: oldnumeric.random_array, and oldnumeric.fft """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function #__all__ = ['convertfile', 'convertall', 'converttree'] __all__ = [] diff --git a/numpy/oldnumeric/array_printer.py b/numpy/oldnumeric/array_printer.py index f14872821..9cccc5023 100644 --- a/numpy/oldnumeric/array_printer.py +++ b/numpy/oldnumeric/array_printer.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['array2string'] diff --git a/numpy/oldnumeric/arrayfns.py b/numpy/oldnumeric/arrayfns.py index 03f816db8..534ccacf7 100644 --- a/numpy/oldnumeric/arrayfns.py +++ b/numpy/oldnumeric/arrayfns.py @@ -1,7 +1,7 @@ """Backward compatible with arrayfns from Numeric. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['array_set', 'construct3', 'digitize', 'error', 'find_mask', 'histogram', 'index_sort', 'interp', 'nz', 'reverse', 'span', diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py index b63226571..841052656 100644 --- a/numpy/oldnumeric/compat.py +++ b/numpy/oldnumeric/compat.py @@ -1,7 +1,7 @@ """Compatibility module containing deprecated names. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import copy diff --git a/numpy/oldnumeric/fft.py b/numpy/oldnumeric/fft.py index 7ea554e4a..0fd3ae48e 100644 --- a/numpy/oldnumeric/fft.py +++ b/numpy/oldnumeric/fft.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['fft', 'fft2d', 'fftnd', 'hermite_fft', 'inverse_fft', 'inverse_fft2d', 'inverse_fftnd', diff --git a/numpy/oldnumeric/fix_default_axis.py b/numpy/oldnumeric/fix_default_axis.py index cefa67239..57ab3ce78 100644 --- a/numpy/oldnumeric/fix_default_axis.py +++ b/numpy/oldnumeric/fix_default_axis.py @@ -34,7 +34,7 @@ std mean """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['convertfile', 'convertall', 'converttree'] @@ -261,7 +261,7 @@ def convertfile(filename, import_change=False): filestr = getfile(filename) newstr, total = add_axis(filestr, import_change) if total > 0: - print "Changing ", filename + print("Changing ", filename) copyfile(filename, filestr) makenewfile(filename, newstr) sys.stdout.flush() diff --git a/numpy/oldnumeric/functions.py b/numpy/oldnumeric/functions.py index 50c11e32c..c5941fb67 100644 --- a/numpy/oldnumeric/functions.py +++ b/numpy/oldnumeric/functions.py @@ -1,7 +1,7 @@ """Functions that should behave the same as Numeric and need changing """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.core.multiarray as mu diff --git a/numpy/oldnumeric/linear_algebra.py b/numpy/oldnumeric/linear_algebra.py index e850cd792..f9938b503 100644 --- a/numpy/oldnumeric/linear_algebra.py +++ b/numpy/oldnumeric/linear_algebra.py @@ -6,7 +6,7 @@ only accesses the following LAPACK functions: dgesv, zgesv, dgeev, zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['LinAlgError', 'solve_linear_equations', 'inverse', 'cholesky_decomposition', 'eigenvalues', diff --git a/numpy/oldnumeric/ma.py b/numpy/oldnumeric/ma.py index b449d619c..31e2bb64d 100644 --- a/numpy/oldnumeric/ma.py +++ b/numpy/oldnumeric/ma.py @@ -9,7 +9,7 @@ Adapted for numpy_core 2005 by Travis Oliphant and (mainly) Paul Dubois. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import types, sys diff --git a/numpy/oldnumeric/matrix.py b/numpy/oldnumeric/matrix.py index e76f8935f..4d04090b8 100644 --- a/numpy/oldnumeric/matrix.py +++ b/numpy/oldnumeric/matrix.py @@ -1,7 +1,7 @@ """This module is for compatibility only. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['UserArray', 'squeeze', 'Matrix', 'asarray', 'dot', 'k', 'Numeric', 'LinearAlgebra', 'identity', 'multiply', 'types', 'string'] diff --git a/numpy/oldnumeric/misc.py b/numpy/oldnumeric/misc.py index 5ef1f0ac9..beaafd503 100644 --- a/numpy/oldnumeric/misc.py +++ b/numpy/oldnumeric/misc.py @@ -1,7 +1,7 @@ """Functions that already have the correct syntax or miscellaneous functions """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['sort', 'copy_reg', 'clip', 'rank', 'sign', 'shape', 'types', 'allclose', 'size', diff --git a/numpy/oldnumeric/mlab.py b/numpy/oldnumeric/mlab.py index d4063f65e..bc2844a87 100644 --- a/numpy/oldnumeric/mlab.py +++ b/numpy/oldnumeric/mlab.py @@ -1,7 +1,7 @@ """This module is for compatibility only. All functions are defined elsewhere. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['rand', 'tril', 'trapz', 'hanning', 'rot90', 'triu', 'diff', 'angle', 'roots', 'ptp', 'kaiser', 'randn', 'cumprod', 'diag', 'msort', diff --git a/numpy/oldnumeric/precision.py b/numpy/oldnumeric/precision.py index 7c85f21fc..d7b0344ee 100644 --- a/numpy/oldnumeric/precision.py +++ b/numpy/oldnumeric/precision.py @@ -6,7 +6,7 @@ The character strings are still for "new" NumPy which is the only Incompatibility with Numeric """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['Character', 'Complex', 'Float', 'PrecisionError', 'PyObject', 'Int', 'UInt', diff --git a/numpy/oldnumeric/random_array.py b/numpy/oldnumeric/random_array.py index 4dcddda12..ecb3d0b23 100644 --- a/numpy/oldnumeric/random_array.py +++ b/numpy/oldnumeric/random_array.py @@ -1,7 +1,7 @@ """Backward compatible module for RandomArray """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['ArgumentError','F','beta','binomial','chi_square', 'exponential', 'gamma', 'get_seed', 'mean_var_test', 'multinomial', @@ -192,12 +192,12 @@ def mean_var_test(x, type, mean, var, skew=[]): x_mean = np.sum(x,axis=0)/n x_minus_mean = x - x_mean x_var = np.sum(x_minus_mean*x_minus_mean,axis=0)/(n-1.0) - print "\nAverage of ", len(x), type - print "(should be about ", mean, "):", x_mean - print "Variance of those random numbers (should be about ", var, "):", x_var + print("\nAverage of ", len(x), type) + print("(should be about ", mean, "):", x_mean) + print("Variance of those random numbers (should be about ", var, "):", x_var) if skew != []: x_skew = (np.sum(x_minus_mean*x_minus_mean*x_minus_mean,axis=0)/9998.)/x_var**(3./2.) - print "Skewness of those random numbers (should be about ", skew, "):", x_skew + print("Skewness of those random numbers (should be about ", skew, "):", x_skew) def test(): obj = mt.get_state() @@ -205,25 +205,25 @@ def test(): obj2 = mt.get_state() if (obj2[1] - obj[1]).any(): raise SystemExit("Failed seed test.") - print "First random number is", random() - print "Average of 10000 random numbers is", np.sum(random(10000),axis=0)/10000. + print("First random number is", random()) + print("Average of 10000 random numbers is", np.sum(random(10000),axis=0)/10000.) x = random([10,1000]) if len(x.shape) != 2 or x.shape[0] != 10 or x.shape[1] != 1000: raise SystemExit("random returned wrong shape") x.shape = (10000,) - print "Average of 100 by 100 random numbers is", np.sum(x,axis=0)/10000. + print("Average of 100 by 100 random numbers is", np.sum(x,axis=0)/10000.) y = uniform(0.5,0.6, (1000,10)) if len(y.shape) !=2 or y.shape[0] != 1000 or y.shape[1] != 10: raise SystemExit("uniform returned wrong shape") y.shape = (10000,) if np.minimum.reduce(y) <= 0.5 or np.maximum.reduce(y) >= 0.6: raise SystemExit("uniform returned out of desired range") - print "randint(1, 10, shape=[50])" - print randint(1, 10, shape=[50]) - print "permutation(10)", permutation(10) - print "randint(3,9)", randint(3,9) - print "random_integers(10, shape=[20])" - print random_integers(10, shape=[20]) + print("randint(1, 10, shape=[50])") + print(randint(1, 10, shape=[50])) + print("permutation(10)", permutation(10)) + print("randint(3,9)", randint(3,9)) + print("random_integers(10, shape=[20])") + print(random_integers(10, shape=[20])) s = 3.0 x = normal(2.0, s, [10, 1000]) if len(x.shape) != 2 or x.shape[0] != 10 or x.shape[1] != 1000: @@ -233,19 +233,19 @@ def test(): x = exponential(3, 10000) mean_var_test(x, "random numbers exponentially distributed with mean %f"%(s,), s, s**2, 2) x = multivariate_normal(np.array([10,20]), np.array(([1,2],[2,4]))) - print "\nA multivariate normal", x + print("\nA multivariate normal", x) if x.shape != (2,): raise SystemExit("multivariate_normal returned wrong shape") x = multivariate_normal(np.array([10,20]), np.array([[1,2],[2,4]]), [4,3]) - print "A 4x3x2 array containing multivariate normals" - print x + print("A 4x3x2 array containing multivariate normals") + print(x) if x.shape != (4,3,2): raise SystemExit("multivariate_normal returned wrong shape") x = multivariate_normal(np.array([-100,0,100]), np.array([[3,2,1],[2,2,1],[1,1,1]]), 10000) x_mean = np.sum(x,axis=0)/10000. - print "Average of 10000 multivariate normals with mean [-100,0,100]" - print x_mean + print("Average of 10000 multivariate normals with mean [-100,0,100]") + print(x_mean) x_minus_mean = x - x_mean - print "Estimated covariance of 10000 multivariate normals with covariance [[3,2,1],[2,2,1],[1,1,1]]" - print np.dot(np.transpose(x_minus_mean),x_minus_mean)/9999. + print("Estimated covariance of 10000 multivariate normals with covariance [[3,2,1],[2,2,1],[1,1,1]]") + print(np.dot(np.transpose(x_minus_mean),x_minus_mean)/9999.) x = beta(5.0, 10.0, 10000) mean_var_test(x, "beta(5.,10.) random numbers", 0.333, 0.014) x = gamma(.01, 2., 10000) @@ -256,14 +256,14 @@ def test(): mean_var_test(x, "F random numbers with 5 and 10 degrees of freedom", 1.25, 1.35) x = poisson(50., 10000) mean_var_test(x, "poisson random numbers with mean 50", 50, 50, 0.14) - print "\nEach element is the result of 16 binomial trials with probability 0.5:" - print binomial(16, 0.5, 16) - print "\nEach element is the result of 16 negative binomial trials with probability 0.5:" - print negative_binomial(16, 0.5, [16,]) - print "\nEach row is the result of 16 multinomial trials with probabilities [0.1, 0.5, 0.1 0.3]:" + print("\nEach element is the result of 16 binomial trials with probability 0.5:") + print(binomial(16, 0.5, 16)) + print("\nEach element is the result of 16 negative binomial trials with probability 0.5:") + print(negative_binomial(16, 0.5, [16,])) + print("\nEach row is the result of 16 multinomial trials with probabilities [0.1, 0.5, 0.1 0.3]:") x = multinomial(16, [0.1, 0.5, 0.1], 8) - print x - print "Mean = ", np.sum(x,axis=0)/8. + print(x) + print("Mean = ", np.sum(x,axis=0)/8.) if __name__ == '__main__': test() diff --git a/numpy/oldnumeric/rng.py b/numpy/oldnumeric/rng.py index 3ad0b4190..1ffd47b27 100644 --- a/numpy/oldnumeric/rng.py +++ b/numpy/oldnumeric/rng.py @@ -4,7 +4,7 @@ Replace import RNG with import numpy.oldnumeric.rng as RNG. It is for backwards compatibility only. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['CreateGenerator','ExponentialDistribution','LogNormalDistribution', 'NormalDistribution', 'UniformDistribution', 'error', 'ranf', diff --git a/numpy/oldnumeric/rng_stats.py b/numpy/oldnumeric/rng_stats.py index 43d763046..ed4781e6c 100644 --- a/numpy/oldnumeric/rng_stats.py +++ b/numpy/oldnumeric/rng_stats.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['average', 'histogram', 'standardDeviation', 'variance'] diff --git a/numpy/oldnumeric/setup.py b/numpy/oldnumeric/setup.py index 9482c216d..5dd8d3c5c 100644 --- a/numpy/oldnumeric/setup.py +++ b/numpy/oldnumeric/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/oldnumeric/tests/test_oldnumeric.py b/numpy/oldnumeric/tests/test_oldnumeric.py index 488b2b471..5ff8e6bd3 100644 --- a/numpy/oldnumeric/tests/test_oldnumeric.py +++ b/numpy/oldnumeric/tests/test_oldnumeric.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import unittest diff --git a/numpy/oldnumeric/tests/test_regression.py b/numpy/oldnumeric/tests/test_regression.py index d169d6f3f..b62a384e4 100644 --- a/numpy/oldnumeric/tests/test_regression.py +++ b/numpy/oldnumeric/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/oldnumeric/typeconv.py b/numpy/oldnumeric/typeconv.py index c3a27f5a3..c4a8c4385 100644 --- a/numpy/oldnumeric/typeconv.py +++ b/numpy/oldnumeric/typeconv.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes'] diff --git a/numpy/oldnumeric/ufuncs.py b/numpy/oldnumeric/ufuncs.py index 7da0b5a93..4ab43cb1f 100644 --- a/numpy/oldnumeric/ufuncs.py +++ b/numpy/oldnumeric/ufuncs.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['less', 'cosh', 'arcsinh', 'add', 'ceil', 'arctan2', 'floor_divide', 'fmod', 'hypot', 'logical_and', 'power', 'sinh', 'remainder', 'cos', diff --git a/numpy/oldnumeric/user_array.py b/numpy/oldnumeric/user_array.py index 8d2421f4a..e5f3ecd01 100644 --- a/numpy/oldnumeric/user_array.py +++ b/numpy/oldnumeric/user_array.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.oldnumeric import * from numpy.lib.user_array import container as UserArray diff --git a/numpy/polynomial/__init__.py b/numpy/polynomial/__init__.py index 1e9919614..e9ca387c3 100644 --- a/numpy/polynomial/__init__.py +++ b/numpy/polynomial/__init__.py @@ -13,7 +13,7 @@ implemented as operations on the coefficients. Additional (module-specific) information can be found in the docstring for the module of interest. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings diff --git a/numpy/polynomial/chebyshev.py b/numpy/polynomial/chebyshev.py index 2c2070c62..dc1b27d76 100644 --- a/numpy/polynomial/chebyshev.py +++ b/numpy/polynomial/chebyshev.py @@ -85,7 +85,7 @@ References (preprint: http://www.math.hmc.edu/~benjamin/papers/CombTrig.pdf, pg. 4) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.linalg as la diff --git a/numpy/polynomial/hermite.py b/numpy/polynomial/hermite.py index f731817c0..9051bf533 100644 --- a/numpy/polynomial/hermite.py +++ b/numpy/polynomial/hermite.py @@ -57,7 +57,7 @@ See also `numpy.polynomial` """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.linalg as la diff --git a/numpy/polynomial/hermite_e.py b/numpy/polynomial/hermite_e.py index 3ecb3c58d..13810c97f 100644 --- a/numpy/polynomial/hermite_e.py +++ b/numpy/polynomial/hermite_e.py @@ -57,7 +57,7 @@ See also `numpy.polynomial` """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.linalg as la diff --git a/numpy/polynomial/laguerre.py b/numpy/polynomial/laguerre.py index a951567de..1cc316bca 100644 --- a/numpy/polynomial/laguerre.py +++ b/numpy/polynomial/laguerre.py @@ -57,7 +57,7 @@ See also `numpy.polynomial` """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.linalg as la diff --git a/numpy/polynomial/legendre.py b/numpy/polynomial/legendre.py index 45107f543..1440cdf87 100644 --- a/numpy/polynomial/legendre.py +++ b/numpy/polynomial/legendre.py @@ -81,7 +81,7 @@ numpy.polynomial.hermite numpy.polynomial.hermite_e """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.linalg as la diff --git a/numpy/polynomial/polynomial.py b/numpy/polynomial/polynomial.py index 49678cbbc..7a0b36cde 100644 --- a/numpy/polynomial/polynomial.py +++ b/numpy/polynomial/polynomial.py @@ -52,7 +52,7 @@ See also `numpy.polynomial` """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['polyzero', 'polyone', 'polyx', 'polydomain', 'polyline', 'polyadd', 'polysub', 'polymulx', 'polymul', 'polydiv', 'polypow', diff --git a/numpy/polynomial/polytemplate.py b/numpy/polynomial/polytemplate.py index adf32170f..eda3ef97c 100644 --- a/numpy/polynomial/polytemplate.py +++ b/numpy/polynomial/polytemplate.py @@ -9,13 +9,13 @@ creating additional specific polynomial classes (e.g., Legendre, Jacobi, etc.) in the future, such that all these classes will have a common API. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import string import sys polytemplate = string.Template(''' -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import warnings from . import polyutils as pu diff --git a/numpy/polynomial/polyutils.py b/numpy/polynomial/polyutils.py index 51caacebe..c8121e633 100644 --- a/numpy/polynomial/polyutils.py +++ b/numpy/polynomial/polyutils.py @@ -31,7 +31,7 @@ Functions - `mapparms` -- parameters of the linear map between domains. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['RankWarning', 'PolyError', 'PolyDomainError', 'PolyBase', 'as_series', 'trimseq', 'trimcoef', 'getdomain', 'mapdomain', diff --git a/numpy/polynomial/setup.py b/numpy/polynomial/setup.py index f1e68b576..ab2ff2be8 100644 --- a/numpy/polynomial/setup.py +++ b/numpy/polynomial/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/polynomial/tests/test_chebyshev.py b/numpy/polynomial/tests/test_chebyshev.py index 2bf73d02b..23a17b464 100644 --- a/numpy/polynomial/tests/test_chebyshev.py +++ b/numpy/polynomial/tests/test_chebyshev.py @@ -1,7 +1,7 @@ """Tests for chebyshev module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.chebyshev as cheb diff --git a/numpy/polynomial/tests/test_classes.py b/numpy/polynomial/tests/test_classes.py index 2439fc8ad..56af16a98 100644 --- a/numpy/polynomial/tests/test_classes.py +++ b/numpy/polynomial/tests/test_classes.py @@ -3,7 +3,7 @@ This tests the convert and cast methods of all the polynomial classes. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.polynomial import ( diff --git a/numpy/polynomial/tests/test_hermite.py b/numpy/polynomial/tests/test_hermite.py index f9b936bbf..785f9b255 100644 --- a/numpy/polynomial/tests/test_hermite.py +++ b/numpy/polynomial/tests/test_hermite.py @@ -1,7 +1,7 @@ """Tests for hermite module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.hermite as herm diff --git a/numpy/polynomial/tests/test_hermite_e.py b/numpy/polynomial/tests/test_hermite_e.py index f7871fe99..84c952578 100644 --- a/numpy/polynomial/tests/test_hermite_e.py +++ b/numpy/polynomial/tests/test_hermite_e.py @@ -1,7 +1,7 @@ """Tests for hermite_e module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.hermite_e as herme diff --git a/numpy/polynomial/tests/test_laguerre.py b/numpy/polynomial/tests/test_laguerre.py index 2aabda114..b7268fe59 100644 --- a/numpy/polynomial/tests/test_laguerre.py +++ b/numpy/polynomial/tests/test_laguerre.py @@ -1,7 +1,7 @@ """Tests for laguerre module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.laguerre as lag diff --git a/numpy/polynomial/tests/test_legendre.py b/numpy/polynomial/tests/test_legendre.py index cd3db4e35..ae86f65b6 100644 --- a/numpy/polynomial/tests/test_legendre.py +++ b/numpy/polynomial/tests/test_legendre.py @@ -1,7 +1,7 @@ """Tests for legendre module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.legendre as leg diff --git a/numpy/polynomial/tests/test_polynomial.py b/numpy/polynomial/tests/test_polynomial.py index c93421c7d..3d9519679 100644 --- a/numpy/polynomial/tests/test_polynomial.py +++ b/numpy/polynomial/tests/test_polynomial.py @@ -1,7 +1,7 @@ """Tests for polynomial module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.polynomial as poly diff --git a/numpy/polynomial/tests/test_polyutils.py b/numpy/polynomial/tests/test_polyutils.py index 95a8f39bb..93c742abd 100644 --- a/numpy/polynomial/tests/test_polyutils.py +++ b/numpy/polynomial/tests/test_polyutils.py @@ -1,7 +1,7 @@ """Tests for polyutils module. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.polynomial.polyutils as pu diff --git a/numpy/polynomial/tests/test_printing.py b/numpy/polynomial/tests/test_printing.py index 3974620a7..96a2ea7d4 100644 --- a/numpy/polynomial/tests/test_printing.py +++ b/numpy/polynomial/tests/test_printing.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy.polynomial as poly from numpy.testing import TestCase, run_module_suite, assert_ diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py index fd401a32c..1c4f9b6fb 100644 --- a/numpy/random/__init__.py +++ b/numpy/random/__init__.py @@ -86,7 +86,7 @@ set_state Set state of generator. ==================== ========================================================= """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # To get sub-modules from .info import __doc__, __all__ diff --git a/numpy/random/info.py b/numpy/random/info.py index 981c55046..970522a95 100644 --- a/numpy/random/info.py +++ b/numpy/random/info.py @@ -82,7 +82,7 @@ set_state Set state of generator. ==================== ========================================================= """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function depends = ['core'] diff --git a/numpy/random/mtrand/generate_mtrand_c.py b/numpy/random/mtrand/generate_mtrand_c.py index 7bfda22eb..ec935e6dd 100644 --- a/numpy/random/mtrand/generate_mtrand_c.py +++ b/numpy/random/mtrand/generate_mtrand_c.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re @@ -33,9 +33,8 @@ if __name__ == '__main__': line = '' m = re.search(unused_funcs_str, line) if m: - print >>sys.stderr, \ - "%s was declared unused, but is used at line %d" % (m.group(), - linenum+1) + print("%s was declared unused, but is used at line %d" % (m.group(), + linenum+1), file=sys.stderr) line = linepat.sub(r'/* "mtrand.pyx":', line) processed.write(line) mtrand_c.close() diff --git a/numpy/random/setup.py b/numpy/random/setup.py index c4582d007..917623bba 100644 --- a/numpy/random/setup.py +++ b/numpy/random/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function from os.path import join, split, dirname import os diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py index 27e7a3755..c9ced3569 100644 --- a/numpy/random/tests/test_random.py +++ b/numpy/random/tests/test_random.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import TestCase, run_module_suite, assert_,\ assert_raises diff --git a/numpy/random/tests/test_regression.py b/numpy/random/tests/test_regression.py index 530c45228..1f223f60d 100644 --- a/numpy/random/tests/test_regression.py +++ b/numpy/random/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import TestCase, run_module_suite, assert_,\ assert_array_equal diff --git a/numpy/setup.py b/numpy/setup.py index 0ea354bf5..a2f089234 100644 --- a/numpy/setup.py +++ b/numpy/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py index cee2d6944..4265eddcf 100644 --- a/numpy/testing/__init__.py +++ b/numpy/testing/__init__.py @@ -5,7 +5,7 @@ in a single location, so that test scripts can just import it and work right away. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from unittest import TestCase diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index 6d3da95ed..ac3526ea7 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -13,7 +13,7 @@ function name, setup and teardown functions and so on - see ``nose.tools`` for more information. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings import sys diff --git a/numpy/testing/noseclasses.py b/numpy/testing/noseclasses.py index f3c15b39d..5497bd9ce 100644 --- a/numpy/testing/noseclasses.py +++ b/numpy/testing/noseclasses.py @@ -4,7 +4,7 @@ # Because this module imports nose directly, it should not # be used except by nosetester.py to avoid a general NumPy # dependency on nose. -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import doctest diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py index 326c36cac..a7354b794 100644 --- a/numpy/testing/nosetester.py +++ b/numpy/testing/nosetester.py @@ -4,7 +4,7 @@ Nose test running. This module implements ``test()`` and ``bench()`` functions for NumPy modules. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -195,19 +195,19 @@ class NoseTester(object): nose = import_nose() import numpy - print "NumPy version %s" % numpy.__version__ + print("NumPy version %s" % numpy.__version__) npdir = os.path.dirname(numpy.__file__) - print "NumPy is installed in %s" % npdir + print("NumPy is installed in %s" % npdir) if 'scipy' in self.package_name: import scipy - print "SciPy version %s" % scipy.__version__ + print("SciPy version %s" % scipy.__version__) spdir = os.path.dirname(scipy.__file__) - print "SciPy is installed in %s" % spdir + print("SciPy is installed in %s" % spdir) pyversion = sys.version.replace('\n','') - print "Python version %s" % pyversion - print "nose version %d.%d.%d" % nose.__versioninfo__ + print("Python version %s" % pyversion) + print("nose version %d.%d.%d" % nose.__versioninfo__) def _get_custom_doctester(self): """ Return instantiated plugin for doctests @@ -335,9 +335,9 @@ class NoseTester(object): utils.verbose = verbose if doctests: - print "Running unit tests and doctests for %s" % self.package_name + print("Running unit tests and doctests for %s" % self.package_name) else: - print "Running unit tests for %s" % self.package_name + print("Running unit tests for %s" % self.package_name) self._show_system_info() @@ -437,7 +437,7 @@ class NoseTester(object): """ - print "Running benchmarks for %s" % self.package_name + print("Running benchmarks for %s" % self.package_name) self._show_system_info() argv = self._test_argv(label, verbose, extra_argv) diff --git a/numpy/testing/nulltester.py b/numpy/testing/nulltester.py index 0419f9436..d94d8ed50 100644 --- a/numpy/testing/nulltester.py +++ b/numpy/testing/nulltester.py @@ -6,7 +6,7 @@ below requirements. See pkgtester, nosetester modules """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function class NullTester(object): diff --git a/numpy/testing/numpytest.py b/numpy/testing/numpytest.py index 4e2409e8d..4fa9364b1 100644 --- a/numpy/testing/numpytest.py +++ b/numpy/testing/numpytest.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -46,7 +46,7 @@ def importall(package): try: exec('import %s as m' % (name)) except Exception as msg: - print 'Failed importing %s: %s' %(name, msg) + print('Failed importing %s: %s' %(name, msg)) continue importall(m) return diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py index 829ba0a16..06c968cf4 100755 --- a/numpy/testing/print_coercion_tables.py +++ b/numpy/testing/print_coercion_tables.py @@ -2,7 +2,7 @@ """Prints type-coercion tables for the built-in NumPy types """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np @@ -20,26 +20,26 @@ class GenericObject(object): dtype = np.dtype('O') def print_cancast_table(ntypes): - print 'X', - for char in ntypes: print char, - print + print('X', end=' ') + for char in ntypes: print(char, end=' ') + print() for row in ntypes: - print row, + print(row, end=' ') for col in ntypes: - print int(np.can_cast(row, col)), - print + print(int(np.can_cast(row, col)), end=' ') + print() def print_coercion_table(ntypes, inputfirstvalue, inputsecondvalue, firstarray, use_promote_types=False): - print '+', - for char in ntypes: print char, - print + print('+', end=' ') + for char in ntypes: print(char, end=' ') + print() for row in ntypes: if row == 'O': rowtype = GenericObject else: rowtype = np.obj2sctype(row) - print row, + print(row, end=' ') for col in ntypes: if col == 'O': coltype = GenericObject @@ -65,25 +65,25 @@ def print_coercion_table(ntypes, inputfirstvalue, inputsecondvalue, firstarray, char = '@' except TypeError: char = '#' - print char, - print + print(char, end=' ') + print() -print "can cast" +print("can cast") print_cancast_table(np.typecodes['All']) -print -print "In these tables, ValueError is '!', OverflowError is '@', TypeError is '#'" -print -print "scalar + scalar" +print() +print("In these tables, ValueError is '!', OverflowError is '@', TypeError is '#'") +print() +print("scalar + scalar") print_coercion_table(np.typecodes['All'], 0, 0, False) -print -print "scalar + neg scalar" +print() +print("scalar + neg scalar") print_coercion_table(np.typecodes['All'], 0, -1, False) -print -print "array + scalar" +print() +print("array + scalar") print_coercion_table(np.typecodes['All'], 0, 0, True) -print -print "array + neg scalar" +print() +print("array + neg scalar") print_coercion_table(np.typecodes['All'], 0, -1, True) -print -print "promote_types" +print() +print("promote_types") print_coercion_table(np.typecodes['All'], 0, 0, False, True) diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py index c72dd1d9a..0e3a9627e 100755 --- a/numpy/testing/setup.py +++ b/numpy/testing/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): diff --git a/numpy/testing/tests/test_decorators.py b/numpy/testing/tests/test_decorators.py index 0acf5a11a..f3e142d54 100644 --- a/numpy/testing/tests/test_decorators.py +++ b/numpy/testing/tests/test_decorators.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np from numpy.testing import * diff --git a/numpy/testing/tests/test_doctesting.py b/numpy/testing/tests/test_doctesting.py index 798c0e7e7..43f9fb6ce 100644 --- a/numpy/testing/tests/test_doctesting.py +++ b/numpy/testing/tests/test_doctesting.py @@ -1,7 +1,7 @@ """ Doctests for NumPy-specific nose/doctest modifications """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # try the #random directive on the output line def check_random_directive(): diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py index f08ca2b12..cbc8cd23e 100644 --- a/numpy/testing/tests/test_utils.py +++ b/numpy/testing/tests/test_utils.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings import sys diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 979894fbc..234311689 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -2,7 +2,7 @@ Utility function to facilitate testing. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/tests/test_ctypeslib.py b/numpy/tests/test_ctypeslib.py index cbf8db6a3..ee36e0a9b 100644 --- a/numpy/tests/test_ctypeslib.py +++ b/numpy/tests/test_ctypeslib.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys @@ -23,7 +23,7 @@ class TestLoadLibrary(TestCase): except ImportError as e: msg = "ctypes is not available on this python: skipping the test" \ " (import error was: %s)" % str(e) - print msg + print(msg) @dec.skipif(not _HAS_CTYPE, "ctypes not available on this python installation") @dec.knownfailureif(sys.platform=='cygwin', "This test is known to fail on cygwin") @@ -36,11 +36,11 @@ class TestLoadLibrary(TestCase): cdll = load_library('multiarray%s' % so, np.core.multiarray.__file__) except ImportError: - print "No distutils available, skipping test." + print("No distutils available, skipping test.") except ImportError as e: msg = "ctypes is not available on this python: skipping the test" \ " (import error was: %s)" % str(e) - print msg + print(msg) class TestNdpointer(TestCase): def test_dtype(self): diff --git a/numpy/tests/test_matlib.py b/numpy/tests/test_matlib.py index 621563462..814c24b0c 100644 --- a/numpy/tests/test_matlib.py +++ b/numpy/tests/test_matlib.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import numpy.matlib diff --git a/pavement.py b/pavement.py index 444976238..605f49a0b 100644 --- a/pavement.py +++ b/pavement.py @@ -55,7 +55,7 @@ TODO - 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 +from __future__ import division, absolute_import, 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 @@ -13,7 +13,7 @@ There are also basic facilities for discrete fourier transform, basic linear algebra and random number generation. """ -from __future__ import division +from __future__ import division, print_function DOCLINES = __doc__.split("\n") diff --git a/setupegg.py b/setupegg.py index e2d1ad0b8..36185db48 100755 --- a/setupegg.py +++ b/setupegg.py @@ -12,7 +12,7 @@ set wrong, with nose refusing to run any tests. To run the tests anyway, use:: >>> np.test(extra_argv=['--exe']) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from setuptools import setup diff --git a/tools/allocation_tracking/setup.py b/tools/allocation_tracking/setup.py index 87fad4999..a75c95e91 100644 --- a/tools/allocation_tracking/setup.py +++ b/tools/allocation_tracking/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function from distutils.core import setup from distutils.extension import Extension diff --git a/tools/allocation_tracking/track_allocations.py b/tools/allocation_tracking/track_allocations.py index ddd0ffea0..2006217c2 100644 --- a/tools/allocation_tracking/track_allocations.py +++ b/tools/allocation_tracking/track_allocations.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpy as np import inspect diff --git a/tools/c_coverage/c_coverage_report.py b/tools/c_coverage/c_coverage_report.py index 83fdd1998..9e29a7566 100755 --- a/tools/c_coverage/c_coverage_report.py +++ b/tools/c_coverage/c_coverage_report.py @@ -4,7 +4,7 @@ A script to create C code-coverage reports based on the output of valgrind's callgrind tool. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import optparse import os @@ -21,7 +21,7 @@ try: from pygments.formatters import HtmlFormatter has_pygments = True except ImportError: - print "This script requires pygments 0.11 or greater to generate HTML" + print("This script requires pygments 0.11 or greater to generate HTML") has_pygments = False @@ -179,6 +179,6 @@ if __name__ == '__main__': files.write_text(options.directory) if 'html' in formats: if not has_pygments: - print "Pygments 0.11 or later is required to generate HTML" + print("Pygments 0.11 or later is required to generate HTML") sys.exit(1) files.write_html(options.directory) diff --git a/tools/commitstats.py b/tools/commitstats.py index 73e995912..a3de1a6c5 100644 --- a/tools/commitstats.py +++ b/tools/commitstats.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # Run svn log -l <some number> @@ -35,10 +35,10 @@ count.sort() -print "** SciPy and NumPy **" -print "=====================" +print("** SciPy and NumPy **") +print("=====================") for val in count: - print val + print(val) diff --git a/tools/osxbuild/build.py b/tools/osxbuild/build.py index 7aa9312dd..71d37889d 100644 --- a/tools/osxbuild/build.py +++ b/tools/osxbuild/build.py @@ -10,7 +10,7 @@ built using sudo so file permissions are correct when installed on user system. Script will prompt for sudo pwd. """ -from __future__ import division +from __future__ import division, print_function import os import shutil @@ -26,9 +26,9 @@ BUILD_DIR = 'build' DIST_DIR = 'dist' def remove_dirs(): - print 'Removing old build and distribution directories...' - print """The distribution is built as root, so the files have the correct - permissions when installed by the user. Chown them to user for removal.""" + print('Removing old build and distribution directories...') + print("""The distribution is built as root, so the files have the correct + permissions when installed by the user. Chown them to user for removal.""") if os.path.exists(BUILD_DIR): cmd = 'sudo chown -R %s %s' % (getuser(), BUILD_DIR) shellcmd(cmd) @@ -39,12 +39,12 @@ def remove_dirs(): shutil.rmtree(DIST_DIR) def build_dist(): - print 'Building distribution... (using sudo)' + print('Building distribution... (using sudo)') cmd = 'sudo python setupegg.py bdist_mpkg' shellcmd(cmd) def build_dmg(): - print 'Building disk image...' + print('Building disk image...') # Since we removed the dist directory at the start of the script, # our pkg should be the only file there. pkg = os.listdir(DIST_DIR)[0] @@ -60,19 +60,19 @@ def copy_readme(): """Copy a user README with info regarding the website, instead of the developer README which tells one how to build the source. """ - print 'Copy user README.txt for installer.' + print('Copy user README.txt for installer.') shutil.copy(USER_README, DEV_README) def revert_readme(): """Revert the developer README.""" - print 'Reverting README.txt...' + print('Reverting README.txt...') cmd = 'svn revert %s' % DEV_README shellcmd(cmd) def shellcmd(cmd, verbose=True): """Call a shell command.""" if verbose: - print cmd + print(cmd) try: subprocess.check_call(cmd, shell=True) except subprocess.CalledProcessError as err: diff --git a/tools/osxbuild/install_and_test.py b/tools/osxbuild/install_and_test.py index 651298b3f..0243724d9 100644 --- a/tools/osxbuild/install_and_test.py +++ b/tools/osxbuild/install_and_test.py @@ -2,7 +2,7 @@ """Install the built package and run the tests. """ -from __future__ import division +from __future__ import division, print_function import os @@ -16,7 +16,7 @@ clrnull = '\033[0m' def color_print(msg): """Add color to this print output.""" clrmsg = clrgreen + msg + clrnull - print clrmsg + print(clrmsg) distdir = os.path.join(SRC_DIR, DIST_DIR) @@ -34,9 +34,9 @@ pkgpath = os.path.abspath(os.path.join(SRC_DIR, DIST_DIR, pkg)) color_print('Installing package: %s' % pkgpath) # Run the installer -print +print() color_print('Installer requires admin rights, you will be prompted for sudo') -print +print() cmd = 'sudo installer -verbose -package %s -target /' % pkgpath #color_print(cmd) shellcmd(cmd) @@ -44,9 +44,9 @@ shellcmd(cmd) # Null out the PYTHONPATH so we're sure to test the Installed version of numpy os.environ['PYTHONPATH'] = '0' -print +print() color_print('Install successful!') color_print('Running numpy test suite!') -print +print() import numpy numpy.test() diff --git a/tools/py3tool.py b/tools/py3tool.py index 07c01c42b..45a8def4c 100755 --- a/tools/py3tool.py +++ b/tools/py3tool.py @@ -18,7 +18,7 @@ When running py3tool again, only changed files are re-processed, which makes the test-bugfix cycle faster. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from optparse import OptionParser import shutil @@ -80,6 +80,7 @@ FIXES_TO_SKIP = [ 'import', 'imports', 'imports2', + 'print', ] skip_fixes= [] diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py index 41d64614f..b8664877e 100644 --- a/tools/test-installed-numpy.py +++ b/tools/test-installed-numpy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # A simple script to test the installed version of numpy by calling # 'numpy.test()'. Key features: diff --git a/tools/win32build/build.py b/tools/win32build/build.py index dc12e807d..782ef3d5e 100644 --- a/tools/win32build/build.py +++ b/tools/win32build/build.py @@ -8,7 +8,7 @@ TODO: - make the config configurable with a file """ -from __future__ import division +from __future__ import division, print_function import sys import subprocess @@ -51,7 +51,7 @@ def write_site_cfg(arch): f.close() def build(arch, pyver): - print "Building numpy binary for python %s, arch is %s" % (get_python_exec(pyver), arch) + print("Building numpy binary for python %s, arch is %s" % (get_python_exec(pyver), arch)) get_clean() write_site_cfg(arch) diff --git a/tools/win32build/doall.py b/tools/win32build/doall.py index e9866122e..fbc794db5 100644 --- a/tools/win32build/doall.py +++ b/tools/win32build/doall.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import subprocess import os diff --git a/tools/win32build/misc/x86analysis.py b/tools/win32build/misc/x86analysis.py index e5eb886b4..39b7cca79 100644 --- a/tools/win32build/misc/x86analysis.py +++ b/tools/win32build/misc/x86analysis.py @@ -5,7 +5,7 @@ # checking the assembly for instructions specific to sse, etc... Obviously, # this won't work all the times (for example, if some instructions are used # only after proper detection of the running CPU, this will give false alarm). -from __future__ import division +from __future__ import division, print_function import sys import re @@ -139,10 +139,10 @@ def main(): analyse(filename) def analyse(filename): - print get_vendor_string() - print "Getting instructions..." + print(get_vendor_string()) + print("Getting instructions...") inst = disassemble(filename) - print "Counting instructions..." + print("Counting instructions...") sse = has_sse(inst) sse2 = has_sse2(inst) sse3 = has_sse3(inst) @@ -151,10 +151,10 @@ def analyse(filename): #print sse #print sse2 #print sse3 - print "SSE3 inst %d" % cntset(sse3) - print "SSE2 inst %d" % cntset(sse2) - print "SSE inst %d" % cntset(sse) - print "Analysed %d instructions" % len(inst) + print("SSE3 inst %d" % cntset(sse3)) + print("SSE2 inst %d" % cntset(sse2)) + print("SSE inst %d" % cntset(sse)) + print("Analysed %d instructions" % len(inst)) if __name__ == '__main__': main() diff --git a/tools/win32build/prepare_bootstrap.py b/tools/win32build/prepare_bootstrap.py index d5822b83e..3984032fd 100644 --- a/tools/win32build/prepare_bootstrap.py +++ b/tools/win32build/prepare_bootstrap.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import os import subprocess |