diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-01-23 14:35:59 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 14:35:59 +1100 |
commit | 61c5c5d2c4ad91a1c5507162c822bfb1426ea405 (patch) | |
tree | cc9b81ae189053ecf2a431a6f2db58715a49dd94 /numpy | |
parent | b02f478988407a5f0d6b608a29141e2fd9814b35 (diff) | |
parent | f9c5bd5ed1c241b189cea6cf5aef750526194708 (diff) | |
download | numpy-61c5c5d2c4ad91a1c5507162c822bfb1426ea405.tar.gz |
Merge pull request #15366 from mwtoews/F403
MAINT: resolve pyflake F403 'from module import *' used
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/multiarray.py | 4 | ||||
-rw-r--r-- | numpy/core/setup.py | 2 | ||||
-rw-r--r-- | numpy/core/tests/test_umath_accuracy.py | 2 | ||||
-rw-r--r-- | numpy/core/umath.py | 4 | ||||
-rw-r--r-- | numpy/distutils/ccompiler.py | 11 | ||||
-rw-r--r-- | numpy/distutils/core.py | 2 | ||||
-rw-r--r-- | numpy/distutils/log.py | 2 | ||||
-rw-r--r-- | numpy/distutils/unixccompiler.py | 4 | ||||
-rw-r--r-- | numpy/matlib.py | 2 |
9 files changed, 19 insertions, 14 deletions
diff --git a/numpy/core/multiarray.py b/numpy/core/multiarray.py index 5749afdcc..d8adc640e 100644 --- a/numpy/core/multiarray.py +++ b/numpy/core/multiarray.py @@ -14,8 +14,8 @@ import sys from . import overrides from . import _multiarray_umath import numpy as np -from numpy.core._multiarray_umath import * -from numpy.core._multiarray_umath import ( +from ._multiarray_umath import * # noqa: F403 +from ._multiarray_umath import ( _fastCopyAndTranspose, _flagdict, _insert, _reconstruct, _vec_string, _ARRAY_API, _monotonicity, _get_ndarray_c_version ) diff --git a/numpy/core/setup.py b/numpy/core/setup.py index e376d5a23..66c1b782e 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -14,7 +14,7 @@ from numpy._build_utils.apple_accelerate import ( uses_accelerate_framework, get_sgemv_fix ) from numpy.compat import npy_load_module -from setup_common import * +from setup_common import * # noqa: F403 # Set to True to enable relaxed strides checking. This (mostly) means # that `strides[dim]` is ignored if `shape[dim] == 1` when setting flags. diff --git a/numpy/core/tests/test_umath_accuracy.py b/numpy/core/tests/test_umath_accuracy.py index 677d9af60..32211974c 100644 --- a/numpy/core/tests/test_umath_accuracy.py +++ b/numpy/core/tests/test_umath_accuracy.py @@ -3,7 +3,7 @@ import platform from os import path import sys import pytest -from ctypes import * +from ctypes import c_float, c_int, cast, pointer, POINTER from numpy.testing import assert_array_max_ulp runtest = sys.platform.startswith('linux') and (platform.machine() == 'x86_64') diff --git a/numpy/core/umath.py b/numpy/core/umath.py index f3b26ab72..c3cebb03f 100644 --- a/numpy/core/umath.py +++ b/numpy/core/umath.py @@ -7,8 +7,8 @@ by importing from the extension module. """ from . import _multiarray_umath -from numpy.core._multiarray_umath import * -from numpy.core._multiarray_umath import ( +from ._multiarray_umath import * # noqa: F403 +from ._multiarray_umath import ( _UFUNC_API, _add_newdoc_ufunc, _ones_like ) diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index ea7912feb..dc7ae6d46 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -7,9 +7,14 @@ import time import subprocess from copy import copy from distutils import ccompiler -from distutils.ccompiler import * -from distutils.errors import DistutilsExecError, DistutilsModuleError, \ - DistutilsPlatformError, CompileError +from distutils.ccompiler import ( + compiler_class, gen_lib_options, get_default_compiler, new_compiler, + CCompiler +) +from distutils.errors import ( + DistutilsExecError, DistutilsModuleError, DistutilsPlatformError, + CompileError, UnknownFileError +) from distutils.sysconfig import customize_compiler from distutils.version import LooseVersion diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index a78bbf484..d3461aa49 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -1,5 +1,5 @@ import sys -from distutils.core import * +from distutils.core import Distribution, setup if 'setuptools' in sys.modules: have_setuptools = True diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py index eac517f56..a8113b9c6 100644 --- a/numpy/distutils/log.py +++ b/numpy/distutils/log.py @@ -1,6 +1,6 @@ # Colored log import sys -from distutils.log import * +from distutils.log import * # noqa: F403 from distutils.log import Log as old_Log from distutils.log import _global_log diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py index cf62cb019..5f36c439f 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py @@ -4,8 +4,8 @@ unixccompiler - can handle very long argument lists for ar. """ import os -from distutils.errors import DistutilsExecError, CompileError -from distutils.unixccompiler import * +from distutils.errors import CompileError, DistutilsExecError, LibError +from distutils.unixccompiler import UnixCCompiler from numpy.distutils.ccompiler import replace_method from numpy.distutils.misc_util import _commandline_dep_string from numpy.distutils import log diff --git a/numpy/matlib.py b/numpy/matlib.py index f3eb8eb4b..1f0345be4 100644 --- a/numpy/matlib.py +++ b/numpy/matlib.py @@ -1,7 +1,7 @@ import numpy as np from numpy.matrixlib.defmatrix import matrix, asmatrix # need * as we're copying the numpy namespace (FIXME: this makes little sense) -from numpy import * +from numpy import * # noqa: F403 __version__ = np.__version__ |