RF: Drop code explicitly tagged as PY2

Author: effigies

nibabel/cifti2/cifti2.py

@@ -17,11 +17,7 @@
     http://www.nitrc.org/projects/cifti
 '''
 import re
-try:
-    from collections.abc import MutableSequence, MutableMapping, Iterable
-except ImportError:
-    # PY2 compatibility
-    from collections import MutableSequence, MutableMapping, Iterable
+from collections.abc import MutableSequence, MutableMapping, Iterable
 from collections import OrderedDict
 from .. import xmlutils as xml
 from ..filebasedimages import FileBasedHeader

nibabel/externals/oset.py

@@ -14,11 +14,7 @@
 """
 
 
-try:
-    from collections.abc import MutableSet
-except ImportError:
-    # PY2 compatibility
-    from collections import MutableSet
+from collections.abc import MutableSet
 
 KEY, PREV, NEXT = range(3)
 

nibabel/streamlines/tractogram.py

@@ -2,12 +2,7 @@
 import numbers
 import numpy as np
 from warnings import warn
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    # PY2 compatibility
-    from collections import MutableMapping
+from collections.abc import MutableMapping
 
 from nibabel.affines import apply_affine
 

nibabel/tests/test_fileslice.py

@@ -2,8 +2,6 @@
 
 import sys
 
-PY2 = sys.version_info[0] < 3
-
 from io import BytesIO
 from itertools import product
 from functools import partial
@@ -250,9 +248,6 @@ def test_threshold_heuristic():
     assert_equal(threshold_heuristic(1, 9, 1, skip_thresh=7), None)
     assert_equal(threshold_heuristic(1, 9, 2, skip_thresh=16), 'full')
     assert_equal(threshold_heuristic(1, 9, 2, skip_thresh=15), None)
-    # long if on Python 2
-    if PY2:
-        assert_equal(threshold_heuristic(long(1), 9, 1, skip_thresh=8), 'full')
     # full slice, smallest step size
     assert_equal(threshold_heuristic(
         slice(0, 9, 1), 9, 2, skip_thresh=2),
@@ -515,10 +510,6 @@ def test_optimize_read_slicers():
     assert_equal(optimize_read_slicers(
         (1, 2, 3), (2, 3, 4), 4, _always),
         ((sn, sn, 3), (1, 2)))
-    if PY2:  # Check we can pass in longs as well
-        assert_equal(optimize_read_slicers(
-            (long(1), long(2), long(3)), (2, 3, 4), 4, _always),
-            ((sn, sn, 3), (1, 2)))
 
 
 def test_slicers2segments():
@@ -540,10 +531,6 @@ def test_slicers2segments():
     assert_equal(slicers2segments(
         (slice(None), slice(None), 2), (10, 6, 4), 7, 4),
         [[7 + 10 * 6 * 2 * 4, 10 * 6 * 4]])
-    if PY2:  # Check we can pass longs on Python 2
-        assert_equal(
-            slicers2segments((long(0), long(1), long(2)), (10, 6, 4), 7, 4),
-            [[7 + 10 * 4 + 10 * 6 * 2 * 4, 4]])
 
 
 def test_calc_slicedefs():

nibabel/tests/test_floating.py

@@ -2,8 +2,6 @@
 """
 import sys
 
-PY2 = sys.version_info[0] < 3
-
 from distutils.version import LooseVersion
 
 import numpy as np
@@ -186,11 +184,6 @@ def test_int_to_float():
     i = 2**(nmant + 1) - 1
     assert_equal(as_int(int_to_float(i, LD)), i)
     assert_equal(as_int(int_to_float(-i, LD)), -i)
-    # Test no error for longs
-    if PY2:
-        i = long(i)
-        assert_equal(as_int(int_to_float(i, LD)), i)
-        assert_equal(as_int(int_to_float(-i, LD)), -i)
     # If longdouble can cope with 2**64, test
     if nmant >= 63:
         # Check conversion to int; the line below causes an error subtracting