MAINT: simplify code that assumes str/unicode and int/long are different types (#15816)

Cleanup from the dropping of python 2

8 files changed, 7 insertions, 19 deletions

diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py
index 924092995..b9ea21f8e 100644
--- a/numpy/lib/arrayterator.py
+++ b/numpy/lib/arrayterator.py
@@ -10,8 +10,6 @@ a user-specified number of elements.
 from operator import mul
 from functools import reduce
 
-from numpy.compat import long
-
 __all__ = ['Arrayterator']
 
 
@@ -108,7 +106,7 @@ class Arrayterator:
             if slice_ is Ellipsis:
                 fixed.extend([slice(None)] * (dims-length+1))
                 length = len(fixed)
-            elif isinstance(slice_, (int, long)):
+            elif isinstance(slice_, int):
                 fixed.append(slice(slice_, slice_+1, 1))
             else:
                 fixed.append(slice_)
diff --git a/numpy/lib/format.py b/numpy/lib/format.py
index e2696c286..2afa4ac10 100644
--- a/numpy/lib/format.py
+++ b/numpy/lib/format.py
@@ -166,7 +166,7 @@ import io
 import warnings
 from numpy.lib.utils import safe_eval
 from numpy.compat import (
-    isfileobj, long, os_fspath, pickle
+    isfileobj, os_fspath, pickle
     )
 
 
@@ -594,7 +594,7 @@ def _read_array_header(fp, version):
 
     # Sanity-check the values.
     if (not isinstance(d['shape'], tuple) or
-            not numpy.all([isinstance(x, (int, long)) for x in d['shape']])):
+            not numpy.all([isinstance(x, int) for x in d['shape']])):
         msg = "shape is not valid: {!r}"
         raise ValueError(msg.format(d['shape']))
     if not isinstance(d['fortran_order'], bool):
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index bcf7898ef..bfcf0d316 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -29,7 +29,6 @@ from numpy.core.multiarray import (
     interp as compiled_interp, interp_complex as compiled_interp_complex
     )
 from numpy.core.umath import _add_newdoc_ufunc as add_newdoc_ufunc
-from numpy.compat import long
 
 import builtins
 
diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py
index 1d69d869e..6964c1128 100644
--- a/numpy/lib/tests/test__iotools.py
+++ b/numpy/lib/tests/test__iotools.py
@@ -9,7 +9,6 @@ from numpy.lib._iotools import (
     LineSplitter, NameValidator, StringConverter,
     has_nested_fields, easy_dtype, flatten_dtype
     )
-from numpy.compat import unicode
 
 
 class TestLineSplitter:
@@ -179,10 +178,10 @@ class TestStringConverter:
         # note that the longdouble type has been skipped, so the
         # _status increases by 2. Everything should succeed with
         # unicode conversion (5).
-        for s in ['a', u'a', b'a']:
+        for s in ['a', b'a']:
             res = converter.upgrade(s)
-            assert_(type(res) is unicode)
-            assert_equal(res, u'a')
+            assert_(type(res) is str)
+            assert_equal(res, 'a')
             assert_equal(converter._status, 5 + status_offset)
 
     def test_missing(self):
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index 3e621f077..23bf3296d 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -21,7 +21,6 @@ from numpy.lib import (
     select, setxor1d, sinc, trapz, trim_zeros, unwrap, unique, vectorize
     )
 
-from numpy.compat import long
 
 def get_mat(n):
     data = np.arange(n)
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py
index a2598990b..55df2a675 100644
--- a/numpy/lib/tests/test_regression.py
+++ b/numpy/lib/tests/test_regression.py
@@ -5,7 +5,6 @@ from numpy.testing import (
     assert_, assert_equal, assert_array_equal, assert_array_almost_equal,
     assert_raises, _assert_valid_refcount,
     )
-from numpy.compat import unicode
 
 
 class TestRegression:
@@ -180,7 +179,7 @@ class TestRegression:
         # related to ticket #1405.
         include_dirs = [np.get_include()]
         for path in include_dirs:
-            assert_(isinstance(path, (str, unicode)))
+            assert_(isinstance(path, str))
             assert_(path != '')
 
     def test_polyder_return_type(self):
diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py
index 47685550a..3f4ca6309 100644
--- a/numpy/lib/tests/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
@@ -1,5 +1,4 @@
 import numpy as np
-from numpy.compat import long
 from numpy.testing import (
     assert_, assert_equal, assert_array_equal, assert_raises
     )
@@ -86,7 +85,6 @@ class TestIsscalar:
         assert_(not np.isscalar([3]))
         assert_(not np.isscalar((3,)))
         assert_(np.isscalar(3j))
-        assert_(np.isscalar(long(10)))
         assert_(np.isscalar(4.0))
 
 
diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py
index 9c266fd6b..d5c2555b4 100644
--- a/numpy/lib/user_array.py
+++ b/numpy/lib/user_array.py
@@ -11,7 +11,6 @@ from numpy.core import (
     bitwise_xor, invert, less, less_equal, not_equal, equal, greater,
     greater_equal, shape, reshape, arange, sin, sqrt, transpose
 )
-from numpy.compat import long
 
 
 class container:
@@ -196,9 +195,6 @@ class container:
     def __int__(self):
         return self._scalarfunc(int)
 
-    def __long__(self):
-        return self._scalarfunc(long)
-
     def __hex__(self):
         return self._scalarfunc(hex)