summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-09-11 10:40:44 -0500
committerGitHub <noreply@github.com>2018-09-11 10:40:44 -0500
commitccaccbcb5d6a5fcbbd60366cb59edd022a8d0c21 (patch)
tree863c53f43d8d60b208bfd555883e8d852407c01e
parentb1187f667a2bb5d7a0c519192440a5116a948180 (diff)
parent5e3412dfc139b733b136c2c3b508eb7bf7b8ec10 (diff)
downloadnumpy-ccaccbcb5d6a5fcbbd60366cb59edd022a8d0c21.tar.gz
Merge pull request #11909 from mattip/flake8-cleanups
MAINT: flake8 cleanups
-rw-r--r--numpy/core/arrayprint.py2
-rw-r--r--numpy/core/numeric.py2
-rw-r--r--numpy/distutils/command/config.py1
-rw-r--r--numpy/distutils/npy_pkg_config.py1
-rw-r--r--numpy/random/tests/test_random.py1
-rw-r--r--numpy/testing/tests/test_decorators.py1
6 files changed, 2 insertions, 6 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index a4b5aecc3..960e64ca3 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -42,7 +42,7 @@ from . import numerictypes as _nt
from .umath import absolute, not_equal, isnan, isinf, isfinite, isnat
from . import multiarray
from .multiarray import (array, dragon4_positional, dragon4_scientific,
- datetime_as_string, datetime_data, dtype, ndarray,
+ datetime_as_string, datetime_data, ndarray,
set_legacy_print_mode)
from .fromnumeric import ravel, any
from .numeric import concatenate, asarray, errstate
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 2e46057ac..fed3c0a9d 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -18,7 +18,7 @@ from .multiarray import (
_fastCopyAndTranspose as fastCopyAndTranspose, ALLOW_THREADS,
BUFSIZE, CLIP, MAXDIMS, MAY_SHARE_BOUNDS, MAY_SHARE_EXACT, RAISE,
WRAP, arange, array, broadcast, can_cast, compare_chararrays,
- concatenate, copyto, count_nonzero, dot, dtype, empty,
+ concatenate, copyto, dot, dtype, empty,
empty_like, flatiter, frombuffer, fromfile, fromiter, fromstring,
inner, int_asbuffer, lexsort, matmul, may_share_memory,
min_scalar_type, ndarray, nditer, nested_iters, promote_types,
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index 47bc496cf..74a05e6a8 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -436,7 +436,6 @@ int main (void)
"involving running executable on the target machine.\n" \
"+++++++++++++++++++++++++++++++++++++++++++++++++\n",
DeprecationWarning, stacklevel=2)
- from distutils.ccompiler import CompileError, LinkError
self._check_compiler()
exitcode, output = 255, ''
try:
diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py
index 6fe517659..9df7c0031 100644
--- a/numpy/distutils/npy_pkg_config.py
+++ b/numpy/distutils/npy_pkg_config.py
@@ -414,7 +414,6 @@ if __name__ == '__main__':
print("%s\t%s - %s" % (info.name, info.name, info.description))
pkg_name = args[1]
- import os
d = os.environ.get('NPY_PKG_CONFIG_PATH')
if d:
info = read_config(pkg_name, ['numpy/core/lib/npy-pkg-config', '.', d])
diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py
index 8328c69c0..42816a943 100644
--- a/numpy/random/tests/test_random.py
+++ b/numpy/random/tests/test_random.py
@@ -9,7 +9,6 @@ from numpy.testing import (
)
from numpy import random
import sys
-import warnings
class TestSeed(object):
diff --git a/numpy/testing/tests/test_decorators.py b/numpy/testing/tests/test_decorators.py
index d00820b80..b8283d9de 100644
--- a/numpy/testing/tests/test_decorators.py
+++ b/numpy/testing/tests/test_decorators.py
@@ -29,7 +29,6 @@ class TestNoseDecorators(object):
pass
def test_slow(self):
- import nose
@dec.slow
def slow_func(x, y, z):
pass