diff options
Diffstat (limited to 'numpy/lib')
42 files changed, 80 insertions, 80 deletions
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): """ |