diff options
Diffstat (limited to 'numpy/core')
58 files changed, 143 insertions, 21 deletions
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py index 5d1599111..011e356b2 100644 --- a/numpy/core/__init__.py +++ b/numpy/core/__init__.py @@ -1,3 +1,4 @@ +from __future__ import division from info import __doc__ from numpy.version import version as __version__ diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index 686b773f2..7ba28f993 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -1,5 +1,10 @@ -#A place for code to be called from C-code -# that implements more complicated stuff. +""" +A place for code to be called from core C-code. + +Some things are more easily handled Python. + +""" +from __future__ import division import re import sys diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py index d3c150ac8..a7f9ccd44 100644 --- a/numpy/core/_methods.py +++ b/numpy/core/_methods.py @@ -1,5 +1,9 @@ -# Array methods which are called by the both the C-code for the method -# and the Python code for the NumPy-namespace function +""" +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 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 f3add4463..fa91a4799 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -1,7 +1,10 @@ """Array printing function $Id: arrayprint.py,v 1.9 2005/09/13 13:58:44 teoliphant Exp $ + """ +from __future__ import division + __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 e69de29bb..b06eaf1a4 100644 --- a/numpy/core/code_generators/__init__.py +++ b/numpy/core/code_generators/__init__.py @@ -0,0 +1 @@ +from __future__ import division diff --git a/numpy/core/code_generators/cversions.py b/numpy/core/code_generators/cversions.py index 036e923ec..020f5f5ae 100644 --- a/numpy/core/code_generators/cversions.py +++ b/numpy/core/code_generators/cversions.py @@ -1,5 +1,10 @@ -"""Simple script to compute the api hash of the current API as defined by -numpy_api_order and ufunc_api_order.""" +"""Simple script to compute the api hash of the current API. + +The API has is defined by numpy_api_order and ufunc_api_order. + +""" +from __future__ import division + from os.path import join, dirname from genapi import fullapi_hash diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py index 32b0972a7..426f4e05e 100644 --- a/numpy/core/code_generators/genapi.py +++ b/numpy/core/code_generators/genapi.py @@ -4,7 +4,10 @@ Get API information encoded in C files. See ``find_function`` for how functions should be formatted, and ``read_order`` for how the order of the functions should be specified. + """ +from __future__ import division + import sys, os, re try: import hashlib diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py index 463fe1695..6a9fde238 100644 --- a/numpy/core/code_generators/generate_numpy_api.py +++ b/numpy/core/code_generators/generate_numpy_api.py @@ -1,3 +1,5 @@ +from __future__ import division + 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 e10b9cd38..862d46e34 100644 --- a/numpy/core/code_generators/generate_ufunc_api.py +++ b/numpy/core/code_generators/generate_ufunc_api.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import genapi diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py index 2d8e4360e..6dd3d4876 100644 --- a/numpy/core/code_generators/generate_umath.py +++ b/numpy/core/code_generators/generate_umath.py @@ -1,3 +1,5 @@ +from __future__ import division + import os import re import struct diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py index 16278f1a2..4a9c747ea 100644 --- a/numpy/core/code_generators/numpy_api.py +++ b/numpy/core/code_generators/numpy_api.py @@ -10,7 +10,9 @@ needs to be updated. When adding a function, make sure to use the next integer not used as an index (in case you use an existing index or jump, the build will stop and raise an exception, so it should hopefully not get unnoticed). + """ +from __future__ import division 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 b8f11e543..8e175160e 100644 --- a/numpy/core/code_generators/ufunc_docstrings.py +++ b/numpy/core/code_generators/ufunc_docstrings.py @@ -1,13 +1,15 @@ -# Docstrings for generated ufuncs -# -# The syntax is designed to look like the function add_newdoc is being -# called from numpy.lib, but in this file add_newdoc puts the docstrings -# in a dictionary. This dictionary is used in -# numpy/core/code_generators/generate_umath.py to generate the docstrings -# for the ufuncs in numpy.core at the C level when the ufuncs are created -# at compile time. - - +""" +Docstrings for generated ufuncs + +The syntax is designed to look like the function add_newdoc is being +called from numpy.lib, but in this file add_newdoc puts the docstrings +in a dictionary. This dictionary is used in +numpy/core/code_generators/generate_umath.py to generate the docstrings +for the ufuncs in numpy.core at the C level when the ufuncs are created +at compile time. + +""" +from __future__ import division docdict = {} diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py index 1f4b3bef8..c85d95c49 100644 --- a/numpy/core/defchararray.py +++ b/numpy/core/defchararray.py @@ -15,6 +15,7 @@ available in your version of Python. The preferred alias for `defchararray` is `numpy.char`. """ +from __future__ import division import sys from numerictypes import string_, unicode_, integer, object_, bool_, character diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 7596e3707..9ca56ce27 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1,4 +1,8 @@ -# Module containing non-deprecated functions borrowed from Numeric. +"""Module containing non-deprecated functions borrowed from Numeric. + +""" +from __future__ import division + __docformat__ = "restructuredtext en" # functions that are now methods diff --git a/numpy/core/function_base.py b/numpy/core/function_base.py index 82b524604..fa6732077 100644 --- a/numpy/core/function_base.py +++ b/numpy/core/function_base.py @@ -1,3 +1,5 @@ +from __future__ import division + __all__ = ['logspace', 'linspace'] import numeric as _nx diff --git a/numpy/core/getlimits.py b/numpy/core/getlimits.py index 4754975e2..7b94346c7 100644 --- a/numpy/core/getlimits.py +++ b/numpy/core/getlimits.py @@ -1,5 +1,7 @@ -""" Machine limits for Float32 and Float64 and (long double) if available... +"""Machine limits for Float32 and Float64 and (long double) if available... + """ +from __future__ import division __all__ = ['finfo','iinfo'] diff --git a/numpy/core/info.py b/numpy/core/info.py index 561e171b0..f56b2d395 100644 --- a/numpy/core/info.py +++ b/numpy/core/info.py @@ -1,4 +1,4 @@ -__doc__ = """Defines a multi-dimensional array and useful procedures for Numerical computation. +"""Defines a multi-dimensional array and useful procedures for Numerical computation. Functions @@ -81,6 +81,7 @@ More Functions: arccosh arcsinh arctanh """ +from __future__ import division depends = ['testing'] global_symbols = ['*'] diff --git a/numpy/core/machar.py b/numpy/core/machar.py index ea9174017..b7e64290e 100644 --- a/numpy/core/machar.py +++ b/numpy/core/machar.py @@ -1,9 +1,11 @@ """ Machine arithmetics - determine the parameters of the floating-point arithmetic system -""" -# Author: Pearu Peterson, September 2003 +Author: Pearu Peterson, September 2003 + +""" +from __future__ import division __all__ = ['MachAr'] diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py index f068c7b6c..5107e9b28 100644 --- a/numpy/core/memmap.py +++ b/numpy/core/memmap.py @@ -1,3 +1,5 @@ +from __future__ import division + __all__ = ['memmap'] import warnings diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index f2381a7a6..a114e4bb5 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1,3 +1,5 @@ +from __future__ import division + __all__ = ['newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc', 'arange', 'array', 'zeros', 'count_nonzero', 'empty', 'broadcast', 'dtype', 'fromstring', 'fromfile', diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index e39eb2232..b069b5426 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -80,6 +80,7 @@ Exported symbols include: \\-> object_ (not used much) (kind=O) """ +from __future__ import division # 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 2e55c48fb..ff5d98d3a 100644 --- a/numpy/core/records.py +++ b/numpy/core/records.py @@ -34,6 +34,8 @@ Record arrays allow us to access fields as properties:: array([ 2., 2.]) """ +from __future__ import division + # 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 6a8b0fc38..8c43f97c0 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -1,3 +1,5 @@ +from __future__ import division + import imp import os import sys diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 1674333ca..1afc71085 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -1,3 +1,5 @@ +from __future__ import division + # Code common to build tools import sys from os.path import join diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index 261379077..4d5439249 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -1,3 +1,5 @@ +from __future__ import division + __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack'] import numeric as _nx diff --git a/numpy/core/src/multiarray/testcalcs.py b/numpy/core/src/multiarray/testcalcs.py index 8cb440820..78a875406 100644 --- a/numpy/core/src/multiarray/testcalcs.py +++ b/numpy/core/src/multiarray/testcalcs.py @@ -1,3 +1,5 @@ +from __future__ import division + from scipy import weave class YMD(object): diff --git a/numpy/core/tests/test_api.py b/numpy/core/tests/test_api.py index df26dd07a..484b6afbd 100644 --- a/numpy/core/tests/test_api.py +++ b/numpy/core/tests/test_api.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import numpy as np diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py index 2a2a97336..a61aa5161 100644 --- a/numpy/core/tests/test_arrayprint.py +++ b/numpy/core/tests/test_arrayprint.py @@ -1,5 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +from __future__ import division + import sys import numpy as np from numpy.testing import * diff --git a/numpy/core/tests/test_blasdot.py b/numpy/core/tests/test_blasdot.py index 3795def66..ec80840c5 100644 --- a/numpy/core/tests/test_blasdot.py +++ b/numpy/core/tests/test_blasdot.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np import sys from numpy.core import zeros, float64 diff --git a/numpy/core/tests/test_datetime.py b/numpy/core/tests/test_datetime.py index f4a1ee617..03ee20b09 100644 --- a/numpy/core/tests/test_datetime.py +++ b/numpy/core/tests/test_datetime.py @@ -1,3 +1,5 @@ +from __future__ import division + import os, pickle import numpy import numpy as np diff --git a/numpy/core/tests/test_defchararray.py b/numpy/core/tests/test_defchararray.py index 85bb623a4..ed928bce1 100644 --- a/numpy/core/tests/test_defchararray.py +++ b/numpy/core/tests/test_defchararray.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * from numpy.core import * import numpy as np diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index 71e724a69..c7cc9d413 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -1,7 +1,10 @@ """ Tests related to deprecation warnings. Also a convenient place to document how deprecations should eventually be turned into errors. + """ +from __future__ import division + import sys import warnings from nose.plugins.skip import SkipTest diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py index f0b0cdc06..a08cf4851 100644 --- a/numpy/core/tests/test_dtype.py +++ b/numpy/core/tests/test_dtype.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import numpy as np from numpy.testing import * diff --git a/numpy/core/tests/test_einsum.py b/numpy/core/tests/test_einsum.py index fb7ceb0db..4fba533db 100644 --- a/numpy/core/tests/test_einsum.py +++ b/numpy/core/tests/test_einsum.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from decimal import Decimal diff --git a/numpy/core/tests/test_errstate.py b/numpy/core/tests/test_errstate.py index cfba6d8b4..c7c5a13ce 100644 --- a/numpy/core/tests/test_errstate.py +++ b/numpy/core/tests/test_errstate.py @@ -1,3 +1,5 @@ +from __future__ import division + import platform import numpy as np diff --git a/numpy/core/tests/test_function_base.py b/numpy/core/tests/test_function_base.py index f1a08d9d5..914ffbb14 100644 --- a/numpy/core/tests/test_function_base.py +++ b/numpy/core/tests/test_function_base.py @@ -1,3 +1,4 @@ +from __future__ import division 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 8cbc79cf9..5d5d9bc44 100644 --- a/numpy/core/tests/test_getlimits.py +++ b/numpy/core/tests/test_getlimits.py @@ -1,5 +1,7 @@ """ Test functions for limits module. + """ +from __future__ import division from numpy.testing import * diff --git a/numpy/core/tests/test_half.py b/numpy/core/tests/test_half.py index f1cf36b5b..ed1b3e5dd 100644 --- a/numpy/core/tests/test_half.py +++ b/numpy/core/tests/test_half.py @@ -1,3 +1,5 @@ +from __future__ import division + import platform import numpy as np diff --git a/numpy/core/tests/test_indexerrors.py b/numpy/core/tests/test_indexerrors.py index 2f9c5d4d2..2d74d2ef3 100644 --- a/numpy/core/tests/test_indexerrors.py +++ b/numpy/core/tests/test_indexerrors.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy.testing import TestCase, run_module_suite, assert_raises, assert_equal, assert_ import sys diff --git a/numpy/core/tests/test_indexing.py b/numpy/core/tests/test_indexing.py index da19d2a2a..6b8b7b8a8 100644 --- a/numpy/core/tests/test_indexing.py +++ b/numpy/core/tests/test_indexing.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy.compat import asbytes from numpy.testing import * diff --git a/numpy/core/tests/test_item_selection.py b/numpy/core/tests/test_item_selection.py index 47de43012..6da27175b 100644 --- a/numpy/core/tests/test_item_selection.py +++ b/numpy/core/tests/test_item_selection.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy.testing import * import sys, warnings diff --git a/numpy/core/tests/test_machar.py b/numpy/core/tests/test_machar.py index 99046ca2a..1d2c42110 100644 --- a/numpy/core/tests/test_machar.py +++ b/numpy/core/tests/test_machar.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * from numpy.core.machar import MachAr diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py index ea9d0616d..5daeaa279 100644 --- a/numpy/core/tests/test_memmap.py +++ b/numpy/core/tests/test_memmap.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from tempfile import NamedTemporaryFile, mktemp import os diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index b3c0626dc..25cc8ced8 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -1,3 +1,5 @@ +from __future__ import division + import tempfile import sys import os diff --git a/numpy/core/tests/test_multiarray_assignment.py b/numpy/core/tests/test_multiarray_assignment.py index 29ddcf906..555de8c4a 100644 --- a/numpy/core/tests/test_multiarray_assignment.py +++ b/numpy/core/tests/test_multiarray_assignment.py @@ -1,3 +1,5 @@ +from __future__ import division + 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 f40ac68a8..1e5620102 100644 --- a/numpy/core/tests/test_nditer.py +++ b/numpy/core/tests/test_nditer.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy import array, arange, nditer, all from numpy.compat import asbytes diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py index 6b5f86e5a..6d0ca4efc 100644 --- a/numpy/core/tests/test_numeric.py +++ b/numpy/core/tests/test_numeric.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import platform from decimal import Decimal diff --git a/numpy/core/tests/test_numerictypes.py b/numpy/core/tests/test_numerictypes.py index 98a6e07aa..f00aee453 100644 --- a/numpy/core/tests/test_numerictypes.py +++ b/numpy/core/tests/test_numerictypes.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * from numpy.compat import asbytes, asunicode diff --git a/numpy/core/tests/test_print.py b/numpy/core/tests/test_print.py index aed262ad2..3b9025d10 100644 --- a/numpy/core/tests/test_print.py +++ b/numpy/core/tests/test_print.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy.testing import * import nose diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py index 2a6403479..5c7cba936 100644 --- a/numpy/core/tests/test_records.py +++ b/numpy/core/tests/test_records.py @@ -1,3 +1,5 @@ +from __future__ import division + from os import path import numpy as np from numpy.testing import * diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py index 6d6d94f7a..95df4a113 100644 --- a/numpy/core/tests/test_regression.py +++ b/numpy/core/tests/test_regression.py @@ -1,3 +1,5 @@ +from __future__ import division + import pickle import sys import platform diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py index 24b5eae24..03b90af79 100644 --- a/numpy/core/tests/test_scalarmath.py +++ b/numpy/core/tests/test_scalarmath.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * import numpy as np diff --git a/numpy/core/tests/test_scalarprint.py b/numpy/core/tests/test_scalarprint.py index 3bed7e62a..3f791e12d 100644 --- a/numpy/core/tests/test_scalarprint.py +++ b/numpy/core/tests/test_scalarprint.py @@ -2,6 +2,7 @@ """ Test printing of scalar types. """ +from __future__ import division 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 b02ee84a5..ccfb18ef7 100644 --- a/numpy/core/tests/test_shape_base.py +++ b/numpy/core/tests/test_shape_base.py @@ -1,3 +1,5 @@ +from __future__ import division + import warnings import numpy as np from numpy.testing import (TestCase, assert_, assert_raises, assert_array_equal, diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index 57fd66892..1de7337c5 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import numpy as np diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py index bd281e000..78aa32234 100644 --- a/numpy/core/tests/test_umath.py +++ b/numpy/core/tests/test_umath.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import platform diff --git a/numpy/core/tests/test_umath_complex.py b/numpy/core/tests/test_umath_complex.py index dfc5f2525..9500056bc 100644 --- a/numpy/core/tests/test_umath_complex.py +++ b/numpy/core/tests/test_umath_complex.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys import platform diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py index 5bcf464bc..8941f8e82 100644 --- a/numpy/core/tests/test_unicode.py +++ b/numpy/core/tests/test_unicode.py @@ -1,3 +1,5 @@ +from __future__ import division + import sys from numpy.testing import * |