diff options
Diffstat (limited to 'numpy/lib')
41 files changed, 69 insertions, 69 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py index 5679a2dc8..37c06c014 100644 --- a/numpy/lib/__init__.py +++ b/numpy/lib/__init__.py @@ -1,26 +1,26 @@ -from __future__ import division +from __future__ import division, absolute_import -from info import __doc__ +from .info import __doc__ from numpy.version import version as __version__ -from type_check import * -from index_tricks import * -from function_base import * -from shape_base import * -from stride_tricks import * -from twodim_base import * -from ufunclike import * +from .type_check import * +from .index_tricks import * +from .function_base import * +from .shape_base import * +from .stride_tricks import * +from .twodim_base import * +from .ufunclike import * -import scimath as emath -from polynomial import * +from . import scimath as emath +from .polynomial import * #import convertcode -from utils import * -from arraysetops import * -from npyio import * -from financial import * +from .utils import * +from .arraysetops import * +from .npyio import * +from .financial import * import math -from arrayterator import * -from arraypad import * +from .arrayterator import * +from .arraypad import * __all__ = ['emath','math'] __all__ += type_check.__all__ diff --git a/numpy/lib/_datasource.py b/numpy/lib/_datasource.py index d5424e8d3..db97c5507 100644 --- a/numpy/lib/_datasource.py +++ b/numpy/lib/_datasource.py @@ -31,7 +31,7 @@ Example:: >>> fp.close() """ -from __future__ import division +from __future__ import division, absolute_import __docformat__ = "restructuredtext en" diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index aa3744204..87ce9b01d 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 +from __future__ import division, absolute_import __docformat__ = "restructuredtext en" diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py index bfb96fc24..fbf65904a 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 +from __future__ import division, absolute_import import numpy as np diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index 61bb81721..e3a39342f 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 +from __future__ import division, absolute_import __all__ = ['ediff1d', 'intersect1d', 'setxor1d', 'union1d', 'setdiff1d', 'unique', 'in1d'] diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py index 6f6953a22..b71e9a123 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 +from __future__ import division, absolute_import from operator import mul diff --git a/numpy/lib/financial.py b/numpy/lib/financial.py index 5887a9224..2a3295bfe 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 +from __future__ import division, absolute_import import numpy as np diff --git a/numpy/lib/format.py b/numpy/lib/format.py index 9a558f40c..21b0607e7 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 +from __future__ import division, absolute_import import cPickle diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 540092d45..9ca72bf41 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import __docformat__ = "restructuredtext en" __all__ = ['select', 'piecewise', 'trim_zeros', 'copy', 'iterable', @@ -26,11 +26,11 @@ from numpy.core.fromnumeric import ravel, nonzero, choose, sort, mean from numpy.core.numerictypes import typecodes, number from numpy.core import atleast_1d, atleast_2d from numpy.lib.twodim_base import diag -from _compiled_base import _insert, add_docstring -from _compiled_base import digitize, bincount, interp as compiled_interp -from arraysetops import setdiff1d -from utils import deprecate -from _compiled_base import add_newdoc_ufunc +from ._compiled_base import _insert, add_docstring +from ._compiled_base import digitize, bincount, interp as compiled_interp +from .arraysetops import setdiff1d +from .utils import deprecate +from ._compiled_base import add_newdoc_ufunc import numpy as np import collections diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 07e7c1e39..ad9af9840 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import __all__ = ['ravel_multi_index', 'unravel_index', @@ -16,9 +16,9 @@ from numpy.core.numeric import ( asarray, ScalarType, array, alltrue, cumprod, from numpy.core.numerictypes import find_common_type import math -import function_base +from . import function_base import numpy.matrixlib as matrix -from function_base import diff +from .function_base import diff from numpy.lib._compiled_base import ravel_multi_index, unravel_index from numpy.lib.stride_tricks import as_strided makemat = matrix.matrix diff --git a/numpy/lib/info.py b/numpy/lib/info.py index 1a2154951..de94f0a19 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 +from __future__ import division, absolute_import depends = ['core','testing'] global_symbols = ['*'] diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index bd96a17f6..065a3ba46 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1,11 +1,11 @@ -from __future__ import division +from __future__ import division, absolute_import __all__ = ['savetxt', 'loadtxt', 'genfromtxt', 'ndfromtxt', 'mafromtxt', 'recfromtxt', 'recfromcsv', 'load', 'loads', 'save', 'savez', 'savez_compressed', 'packbits', 'unpackbits', 'fromregex', 'DataSource'] import numpy as np -import format +from . import format import sys import os import re @@ -16,10 +16,10 @@ import weakref from operator import itemgetter from cPickle import load as _cload, loads -from _datasource import DataSource -from _compiled_base import packbits, unpackbits +from ._datasource import DataSource +from ._compiled_base import packbits, unpackbits -from _iotools import LineSplitter, NameValidator, StringConverter, \ +from ._iotools import LineSplitter, NameValidator, StringConverter, \ ConverterError, ConverterLockError, ConversionWarning, \ _is_string_like, has_nested_fields, flatten_dtype, \ easy_dtype, _bytes_to_name diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py index de83016e9..2d455e33a 100644 --- a/numpy/lib/polynomial.py +++ b/numpy/lib/polynomial.py @@ -2,7 +2,7 @@ Functions to operate on polynomials. """ -from __future__ import division +from __future__ import division, absolute_import __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd', 'polysub', 'polymul', 'polydiv', 'polyval', 'poly1d', diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index c72cf2059..9f0beff59 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 +from __future__ import division, absolute_import import sys import itertools diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py index 00fc4bccd..0457e120c 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 +from __future__ import division, absolute_import __all__ = ['sqrt', 'log', 'log2', 'logn','log10', 'power', 'arccos', 'arcsin', 'arctanh'] diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index 1aa8f686c..909f6faa8 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import __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 b82537024..70457c19f 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 +from __future__ import division, absolute_import import numpy as np diff --git a/numpy/lib/tests/test__datasource.py b/numpy/lib/tests/test__datasource.py index f025b947e..e784e4296 100644 --- a/numpy/lib/tests/test__datasource.py +++ b/numpy/lib/tests/test__datasource.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os from tempfile import mkdtemp, mkstemp, NamedTemporaryFile diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py index 6416b6d7a..ebb01ad3a 100644 --- a/numpy/lib/tests/test__iotools.py +++ b/numpy/lib/tests/test__iotools.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import sys diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py index e70c06aeb..0a87acb36 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 +from __future__ import division, absolute_import 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 cab7a86b1..b0a2e429d 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 +from __future__ import division, absolute_import 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 5064ab496..28feb4824 100644 --- a/numpy/lib/tests/test_arrayterator.py +++ b/numpy/lib/tests/test_arrayterator.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from operator import mul diff --git a/numpy/lib/tests/test_financial.py b/numpy/lib/tests/test_financial.py index d11195f0d..56681dbb4 100644 --- a/numpy/lib/tests/test_financial.py +++ b/numpy/lib/tests/test_financial.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import 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 320cef3d2..5c07da1c3 100644 --- a/numpy/lib/tests/test_format.py +++ b/numpy/lib/tests/test_format.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import 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 73af90386..406bad40b 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 +from __future__ import division, absolute_import 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 2b42fdc2c..02516cab7 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 +from __future__ import division, absolute_import 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 ba28cf73a..ab990976e 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import sys import gzip diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py index fc2b49c81..4a110d58e 100644 --- a/numpy/lib/tests/test_polynomial.py +++ b/numpy/lib/tests/test_polynomial.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import ''' >>> p = np.poly1d([1.,2,3]) diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py index 6a0ad1609..f38a6914c 100644 --- a/numpy/lib/tests/test_recfunctions.py +++ b/numpy/lib/tests/test_recfunctions.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import sys diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index e0a3a424d..9e303d2b1 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * from numpy.testing.utils import _assert_valid_refcount diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py index 70c4d33ac..9aaf3d086 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 +from __future__ import division, absolute_import 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 0ac1c279b..b6408fe19 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 +from __future__ import division, absolute_import 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 f6b4ba4c3..e2d24464a 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 +from __future__ import division, absolute_import from numpy.testing import * diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py index c4f4a6299..c1204cec4 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 +from __future__ import division, absolute_import 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 0f688b021..d4505266c 100644 --- a/numpy/lib/tests/test_ufunclike.py +++ b/numpy/lib/tests/test_ufunclike.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import 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 534806ff2..4b386e0b1 100644 --- a/numpy/lib/tests/test_utils.py +++ b/numpy/lib/tests/test_utils.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import from numpy.testing import * import numpy.lib.utils as utils diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index 92df5306d..b2e74e07a 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 +from __future__ import division, absolute_import __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 895c4d406..b59cf13aa 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 +from __future__ import division, absolute_import __all__ = ['iscomplexobj','isrealobj','imag','iscomplex', 'isreal','nan_to_num','real','real_if_close', @@ -11,7 +11,7 @@ __all__ = ['iscomplexobj','isrealobj','imag','iscomplex', import numpy.core.numeric as _nx from numpy.core.numeric import asarray, asanyarray, array, isnan, \ obj2sctype, zeros -from ufunclike import isneginf, isposinf +from .ufunclike import isneginf, isposinf _typecodes_by_elsize = 'GDFgdfQqLlIiHhBb?' diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py index 8b85ef770..a71dab0d0 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 +from __future__ import division, absolute_import __all__ = ['fix', 'isneginf', 'isposinf'] diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py index 51ab10520..e6871f489 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 +from __future__ import division, absolute_import from numpy.core import array, asarray, absolute, add, subtract, multiply, \ divide, remainder, power, left_shift, right_shift, bitwise_and, \ diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index 2e70bfd15..9a8776098 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import import os import sys |