summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-03-17 15:01:28 -0600
committerGitHub <noreply@github.com>2019-03-17 15:01:28 -0600
commitd89c4c7e7850578e5ee61e3e09abd86318906975 (patch)
tree6736e5339887d30ea1207a8a943fd4161e714279 /numpy/lib
parent1a92b74a5387f676dd389ffd91054e8c2733f413 (diff)
parent32129453da0f9bf0f352adaaff79f884d2bf52bc (diff)
downloadnumpy-d89c4c7e7850578e5ee61e3e09abd86318906975.tar.gz
Merge pull request #13140 from mattip/lgtm-fixes
DEV: cleanup imports and some assignments (from LGTM)
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/function_base.py1
-rw-r--r--numpy/lib/npyio.py5
2 files changed, 1 insertions, 5 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index b61a64b8e..fb40ef927 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -31,7 +31,6 @@ from numpy.core.overrides import set_module
from numpy.core import overrides
from numpy.core.function_base import add_newdoc
from numpy.lib.twodim_base import diag
-from .utils import deprecate
from numpy.core.multiarray import (
_insert, add_docstring, bincount, normalize_axis_index, _monotonicity,
interp as compiled_interp, interp_complex as compiled_interp_complex
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 1e43fdb34..d702859fa 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -23,8 +23,7 @@ from ._iotools import (
)
from numpy.compat import (
- asbytes, asstr, asunicode, asbytes_nested, bytes, basestring, unicode,
- os_fspath, os_PathLike, pickle
+ asbytes, asstr, asunicode, bytes, basestring, os_fspath, os_PathLike, pickle
)
if sys.version_info[0] >= 3:
@@ -1123,7 +1122,6 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None,
if type(x) is bytes:
return conv(x)
return conv(x.encode("latin1"))
- import functools
converters[i] = functools.partial(tobytes_first, conv=conv)
else:
converters[i] = conv
@@ -1974,7 +1972,6 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
if type(x) is bytes:
return conv(x)
return conv(x.encode("latin1"))
- import functools
user_conv = functools.partial(tobytes_first, conv=conv)
else:
user_conv = conv