diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2020-01-23 13:25:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 13:25:09 -0700 |
commit | 36a2bf0ce8b072d557af5b58a9003a6bc72caaef (patch) | |
tree | dea44e19f7bbbeda64a219506fdcf8088e449ea6 /numpy/core | |
parent | 04ac2a13b302a7af6fe2a5ca67e09a0e09a0f8e7 (diff) | |
parent | 021163b5e2293286b26d22bdae51305da634e74d (diff) | |
download | numpy-36a2bf0ce8b072d557af5b58a9003a6bc72caaef.tar.gz |
Merge pull request #15403 from WarrenWeckesser/flakes
MAINT: Clean up, mostly unused imports.
Diffstat (limited to 'numpy/core')
-rw-r--r-- | numpy/core/_add_newdocs.py | 1 | ||||
-rw-r--r-- | numpy/core/_exceptions.py | 1 | ||||
-rw-r--r-- | numpy/core/arrayprint.py | 4 | ||||
-rw-r--r-- | numpy/core/fromnumeric.py | 1 | ||||
-rw-r--r-- | numpy/core/multiarray.py | 3 | ||||
-rw-r--r-- | numpy/core/numeric.py | 3 | ||||
-rw-r--r-- | numpy/core/records.py | 1 | ||||
-rw-r--r-- | numpy/core/setup_common.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_arrayprint.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_defchararray.py | 3 | ||||
-rw-r--r-- | numpy/core/tests/test_deprecations.py | 2 | ||||
-rw-r--r-- | numpy/core/tests/test_function_base.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_indexing.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_mem_overlap.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_scalar_ctors.py | 6 | ||||
-rw-r--r-- | numpy/core/tests/test_scalar_methods.py | 8 | ||||
-rw-r--r-- | numpy/core/tests/test_scalarbuffer.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_scalarprint.py | 2 | ||||
-rw-r--r-- | numpy/core/tests/test_shape_base.py | 1 | ||||
-rw-r--r-- | numpy/core/tests/test_unicode.py | 2 |
20 files changed, 8 insertions, 36 deletions
diff --git a/numpy/core/_add_newdocs.py b/numpy/core/_add_newdocs.py index cb68b8360..87ae96fa0 100644 --- a/numpy/core/_add_newdocs.py +++ b/numpy/core/_add_newdocs.py @@ -8,7 +8,6 @@ NOTE: Many of the methods of ndarray have corresponding functions. core/fromnumeric.py, core/defmatrix.py up-to-date. """ -import sys from numpy.core import numerictypes as _numerictypes from numpy.core import dtype diff --git a/numpy/core/_exceptions.py b/numpy/core/_exceptions.py index 88a45561f..99172e23d 100644 --- a/numpy/core/_exceptions.py +++ b/numpy/core/_exceptions.py @@ -157,7 +157,6 @@ class _ArrayMemoryError(MemoryError): @staticmethod def _size_to_string(num_bytes): """ Convert a number of bytes into a binary size string """ - import math # https://en.wikipedia.org/wiki/Binary_prefix LOG2_STEP = 10 diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index ec7e4261f..456ef76f0 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -31,12 +31,12 @@ except ImportError: import numpy as np from . import numerictypes as _nt -from .umath import absolute, not_equal, isnan, isinf, isfinite, isnat +from .umath import absolute, isinf, isfinite, isnat from . import multiarray from .multiarray import (array, dragon4_positional, dragon4_scientific, datetime_as_string, datetime_data, ndarray, set_legacy_print_mode) -from .fromnumeric import ravel, any +from .fromnumeric import any from .numeric import concatenate, asarray, errstate from .numerictypes import (longlong, intc, int_, float_, complex_, bool_, flexible) diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 213a4438f..46dd961d8 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -6,7 +6,6 @@ import types import warnings import numpy as np -from .. import VisibleDeprecationWarning from . import multiarray as mu from . import overrides from . import umath as um diff --git a/numpy/core/multiarray.py b/numpy/core/multiarray.py index d8adc640e..d50c53e30 100644 --- a/numpy/core/multiarray.py +++ b/numpy/core/multiarray.py @@ -7,13 +7,10 @@ by importing from the extension module. """ import functools -import sys import warnings -import sys from . import overrides from . import _multiarray_umath -import numpy as np from ._multiarray_umath import * # noqa: F403 from ._multiarray_umath import ( _fastCopyAndTranspose, _flagdict, _insert, _reconstruct, _vec_string, diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 72c6089b8..f1d7d48f1 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -4,10 +4,9 @@ import operator import sys import warnings import numbers -import contextlib import numpy as np -from numpy.compat import pickle, basestring +from numpy.compat import basestring from . import multiarray from .multiarray import ( _fastCopyAndTranspose as fastCopyAndTranspose, ALLOW_THREADS, diff --git a/numpy/core/records.py b/numpy/core/records.py index d4aa2feb9..fbef40f72 100644 --- a/numpy/core/records.py +++ b/numpy/core/records.py @@ -33,7 +33,6 @@ Record arrays allow us to access fields as properties:: array([2., 2.]) """ -import sys import os import warnings from collections import Counter, OrderedDict diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 08337a81e..7cac66e61 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -2,7 +2,6 @@ import sys import warnings import copy -import binascii import textwrap from numpy.distutils.misc_util import mingw32 diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py index 96240be0f..cd3e501a5 100644 --- a/numpy/core/tests/test_arrayprint.py +++ b/numpy/core/tests/test_arrayprint.py @@ -837,7 +837,6 @@ class TestPrintOptions: assert_raises(TypeError, np.set_printoptions, threshold=b'1') def test_unicode_object_array(): - import sys expected = "array(['é'], dtype=object)" x = np.array([u'\xe9'], dtype=object) assert_equal(repr(x), expected) diff --git a/numpy/core/tests/test_defchararray.py b/numpy/core/tests/test_defchararray.py index 4c9016c3e..39600553d 100644 --- a/numpy/core/tests/test_defchararray.py +++ b/numpy/core/tests/test_defchararray.py @@ -1,10 +1,9 @@ -import sys import numpy as np from numpy.core.multiarray import _vec_string from numpy.testing import ( assert_, assert_equal, assert_array_equal, assert_raises, - assert_raises_regex, suppress_warnings, + assert_raises_regex ) kw_unicode_true = {'unicode': True} # make 2to3 work properly diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index 252133d7b..01b35ec90 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -4,11 +4,9 @@ to document how deprecations should eventually be turned into errors. """ import datetime -import sys import operator import warnings import pytest -import shutil import tempfile import numpy as np diff --git a/numpy/core/tests/test_function_base.py b/numpy/core/tests/test_function_base.py index 7e5ea1cc6..2197ef0cd 100644 --- a/numpy/core/tests/test_function_base.py +++ b/numpy/core/tests/test_function_base.py @@ -4,7 +4,6 @@ from numpy import ( ) from numpy.testing import ( assert_, assert_equal, assert_raises, assert_array_equal, assert_allclose, - suppress_warnings ) diff --git a/numpy/core/tests/test_indexing.py b/numpy/core/tests/test_indexing.py index 237e381a7..4bb5cb11a 100644 --- a/numpy/core/tests/test_indexing.py +++ b/numpy/core/tests/test_indexing.py @@ -2,7 +2,6 @@ import sys import warnings import functools import operator -import pytest import numpy as np from numpy.core._multiarray_tests import array_indexing diff --git a/numpy/core/tests/test_mem_overlap.py b/numpy/core/tests/test_mem_overlap.py index d3b58d8e8..3e9875f5b 100644 --- a/numpy/core/tests/test_mem_overlap.py +++ b/numpy/core/tests/test_mem_overlap.py @@ -1,4 +1,3 @@ -import sys import itertools import pytest diff --git a/numpy/core/tests/test_scalar_ctors.py b/numpy/core/tests/test_scalar_ctors.py index d3592a5fc..2de5084b6 100644 --- a/numpy/core/tests/test_scalar_ctors.py +++ b/numpy/core/tests/test_scalar_ctors.py @@ -1,13 +1,9 @@ """ Test the scalar constructors, which also do type-coercion """ -import sys -import platform -import pytest - import numpy as np from numpy.testing import ( - assert_equal, assert_almost_equal, assert_raises, assert_warns, + assert_equal, assert_almost_equal, assert_warns, ) class TestFromString: diff --git a/numpy/core/tests/test_scalar_methods.py b/numpy/core/tests/test_scalar_methods.py index c9de3e402..4f5fd2988 100644 --- a/numpy/core/tests/test_scalar_methods.py +++ b/numpy/core/tests/test_scalar_methods.py @@ -1,18 +1,14 @@ """ Test the scalar constructors, which also do type-coercion """ -import os import fractions import platform import pytest import numpy as np -from numpy.testing import ( - run_module_suite, - assert_equal, assert_almost_equal, assert_raises, assert_warns, - dec -) +from numpy.testing import assert_equal, assert_raises + class TestAsIntegerRatio: # derived in part from the cpython test "test_floatasratio" diff --git a/numpy/core/tests/test_scalarbuffer.py b/numpy/core/tests/test_scalarbuffer.py index bda1c5333..b8c6dd4aa 100644 --- a/numpy/core/tests/test_scalarbuffer.py +++ b/numpy/core/tests/test_scalarbuffer.py @@ -1,7 +1,6 @@ """ Test scalar buffer interface adheres to PEP 3118 """ -import sys import numpy as np import pytest diff --git a/numpy/core/tests/test_scalarprint.py b/numpy/core/tests/test_scalarprint.py index 3293d0426..d042eef8b 100644 --- a/numpy/core/tests/test_scalarprint.py +++ b/numpy/core/tests/test_scalarprint.py @@ -8,7 +8,7 @@ import pytest from tempfile import TemporaryFile import numpy as np -from numpy.testing import assert_, assert_equal, suppress_warnings +from numpy.testing import assert_, assert_equal class TestRealScalars: def test_str(self): diff --git a/numpy/core/tests/test_shape_base.py b/numpy/core/tests/test_shape_base.py index 7c23c7128..738260327 100644 --- a/numpy/core/tests/test_shape_base.py +++ b/numpy/core/tests/test_shape_base.py @@ -1,5 +1,4 @@ import pytest -import sys import numpy as np from numpy.core import ( array, arange, atleast_1d, atleast_2d, atleast_3d, block, vstack, hstack, diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py index f16789148..ac065d5d6 100644 --- a/numpy/core/tests/test_unicode.py +++ b/numpy/core/tests/test_unicode.py @@ -1,5 +1,3 @@ -import sys - import numpy as np from numpy.compat import unicode from numpy.testing import assert_, assert_equal, assert_array_equal |