diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2020-03-26 17:50:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 12:50:20 -0500 |
| commit | 1c58504eec43f9ba18ac835131fed496fb59772d (patch) | |
| tree | 4ffc786c9cdac81887680aa999ae6dcbd4bd407d /numpy/__init__.py | |
| parent | 5ff70eb0fd61a39207d5166479507e1b099cb707 (diff) | |
| download | numpy-1c58504eec43f9ba18ac835131fed496fb59772d.tar.gz | |
MAINT: simplify code that assumes str/unicode and int/long are different types (#15816)
Cleanup from the dropping of python 2
Diffstat (limited to 'numpy/__init__.py')
| -rw-r--r-- | numpy/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py index 1d8570f71..2d3423c56 100644 --- a/numpy/__init__.py +++ b/numpy/__init__.py @@ -153,13 +153,12 @@ else: from . import ma from . import matrixlib as _mat from .matrixlib import * - from .compat import long # Make these accessible from numpy name-space # but not imported in from numpy import * # TODO[gh-6103]: Deprecate these from builtins import bool, int, float, complex, object, str - unicode = str + from .compat import long, unicode from .core import round, abs, max, min # now that numpy modules are imported, can initialize limits |