2to3: Apply the numliterals fixer and skip the long fixer.

numpy/__init__.py

@@ -159,13 +159,14 @@ def pkgload(*packages, **options):
     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 *
     if sys.version_info[0] >= 3:
-        from builtins import bool, int, long, float, complex, object, unicode, str
+        from builtins import bool, int, float, complex, object, unicode, str
     else:
-        from __builtin__ import bool, int, long, float, complex, object, unicode, str
+        from __builtin__ import bool, int, float, complex, object, unicode, str
 
     from .core import round, abs, max, min
 

numpy/compat/py3k.py

@@ -6,12 +6,14 @@
 
 __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar',
            'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested',
-           'asstr', 'open_latin1']
+           'asstr', 'open_latin1', 'long']
 
 import sys
 
 if sys.version_info[0] >= 3:
     import io
+    long = int
+    integer_types = (int,)
     bytes = bytes
     unicode = str
 
@@ -38,13 +40,17 @@ def open_latin1(filename, mode='r'):
 
     strchar = 'U'
 
+
 else:
     bytes = str
     unicode = unicode
+    long = long
+    integer_types = (int, long)
     asbytes = str
     asstr = str
     strchar = 'S'
 
+
     def isfileobj(f):
         return isinstance(f, file)
 
@@ -56,6 +62,7 @@ def asunicode(s):
     def open_latin1(filename, mode='r'):
         return open(filename, mode=mode)
 
+
 def getexception():
     return sys.exc_info()[1]
 

numpy/core/defchararray.py

@@ -22,7 +22,7 @@
 from .numeric import ndarray, compare_chararrays
 from .numeric import array as narray
 from numpy.core.multiarray import _vec_string
-from numpy.compat import asbytes
+from numpy.compat import asbytes, long
 import numpy
 
 __all__ = ['chararray',

numpy/core/getlimits.py

@@ -260,7 +260,7 @@ def min(self):
             try:
                 val = iinfo._min_vals[self.key]
             except KeyError:
-                val = int(-(1L << (self.bits-1)))
+                val = int(-(1 << (self.bits-1)))
                 iinfo._min_vals[self.key] = val
             return val
 
@@ -272,9 +272,9 @@ def max(self):
             val = iinfo._max_vals[self.key]
         except KeyError:
             if self.kind == 'u':
-                val = int((1L << self.bits) - 1)
+                val = int((1 << self.bits) - 1)
             else:
-                val = int((1L << (self.bits-1)) - 1)
+                val = int((1 << (self.bits-1)) - 1)
             iinfo._max_vals[self.key] = val
         return val
 

numpy/core/memmap.py

@@ -3,10 +3,11 @@
 __all__ = ['memmap']
 
 import warnings
-from .numeric import uint8, ndarray, dtype
 import sys
 
 import numpy as np
+from .numeric import uint8, ndarray, dtype
+from numpy.compat import long
 
 dtypedescr = dtype
 valid_filemodes = ["r", "c", "r+", "w+"]

numpy/core/numerictypes.py

@@ -90,26 +90,22 @@
            'busday_offset', 'busday_count', 'is_busday', 'busdaycalendar',
            ]
 
-from numpy.core.multiarray import typeinfo, ndarray, array, \
-                      empty, dtype, datetime_data, datetime_as_string, \
-                      busday_offset, busday_count, is_busday, busdaycalendar
+from numpy.core.multiarray import (
+        typeinfo, ndarray, array, empty, dtype, datetime_data,
+        datetime_as_string, busday_offset, busday_count, is_busday,
+        busdaycalendar
+        )
 import types as _types
 import sys
+from numpy.compat import bytes, long
 
 # we don't export these for import *, but we do want them accessible
 # as numerictypes.bool, etc.
 if sys.version_info[0] >= 3:
-    from builtins import bool, int, long, float, complex, object, unicode, str
+    from builtins import bool, int, float, complex, object, unicode, str
 else:
-    from __builtin__ import bool, int, long, float, complex, object, unicode, str
+    from __builtin__ import bool, int, float, complex, object, unicode, str
 
-from numpy.compat import bytes
-
-if sys.version_info[0] >= 3:
-    # Py3K
-    class long(int):
-        # Placeholder class -- this will not escape outside numerictypes.py
-        pass
 
 # String-handling utilities to avoid locale-dependence.
 
@@ -861,7 +857,7 @@ def sctype2char(sctype):
                    _types.StringType, _types.UnicodeType, _types.BufferType]
 except AttributeError:
     # Py3K
-    ScalarType = [int, float, complex, long, bool, bytes, str, memoryview]
+    ScalarType = [int, float, complex, int, bool, bytes, str, memoryview]
 
 ScalarType.extend(_sctype2char_dict.keys())
 ScalarType = tuple(ScalarType)

numpy/core/records.py

@@ -46,7 +46,7 @@
 import os
 import sys
 
-from numpy.compat import isfileobj, bytes
+from numpy.compat import isfileobj, bytes, long
 
 ndarray = sb.ndarray
 

numpy/core/tests/test_regression.py

@@ -17,7 +17,7 @@
         assert_raises, assert_warns, dec
         )
 from numpy.testing.utils import _assert_valid_refcount, WarningManager
-from numpy.compat import asbytes, asunicode, asbytes_nested
+from numpy.compat import asbytes, asunicode, asbytes_nested, long
 
 rlevel = 1
 

numpy/core/tests/test_shape_base.py

@@ -6,6 +6,7 @@
                            assert_equal, run_module_suite)
 from numpy.core import (array, arange, atleast_1d, atleast_2d, atleast_3d,
                         vstack, hstack, newaxis, concatenate)
+from numpy.compat import long
 
 class TestAtleast1d(TestCase):
     def test_0D_array(self):
@@ -43,7 +44,7 @@ def test_r1array(self):
         """
         assert_(atleast_1d(3).shape == (1,))
         assert_(atleast_1d(3j).shape == (1,))
-        assert_(atleast_1d(3L).shape == (1,))
+        assert_(atleast_1d(long(3)).shape == (1,))
         assert_(atleast_1d(3.0).shape == (1,))
         assert_(atleast_1d([[2,3],[4,5]]).shape == (2,2))
 

numpy/f2py/tests/test_return_complex.py

@@ -2,6 +2,7 @@
 
 from numpy.testing import *
 from numpy import array
+from numpy.compat import long
 import util
 
 class TestReturnComplex(util.F2PyTest):
@@ -13,7 +14,7 @@ def check_function(self, t):
             err = 0.0
         assert_( abs(t(234j)-234.0j)<=err)
         assert_( abs(t(234.6)-234.6)<=err)
-        assert_( abs(t(234l)-234.0)<=err)
+        assert_( abs(t(long(234))-234.0)<=err)
         assert_( abs(t(234.6+3j)-(234.6+3j))<=err)
         #assert_( abs(t('234')-234.)<=err)
         #assert_( abs(t('234.6')-234.6)<=err)
@@ -44,7 +45,7 @@ def check_function(self, t):
         assert_raises(TypeError, t, {})
 
         try:
-            r = t(10l**400)
+            r = t(10**400)
             assert_( repr(r) in ['(inf+0j)','(Infinity+0j)'],repr(r))
         except OverflowError:
             pass

numpy/f2py/tests/test_return_integer.py

@@ -2,13 +2,14 @@
 
 from numpy.testing import *
 from numpy import array
+from numpy.compat import long
 import util
 
 class TestReturnInteger(util.F2PyTest):
     def check_function(self, t):
         assert_( t(123)==123,repr(t(123)))
         assert_( t(123.6)==123)
-        assert_( t(123l)==123)
+        assert_( t(long(123))==123)
         assert_( t('123')==123)
         assert_( t(-123)==-123)
         assert_( t([123])==123)
@@ -34,7 +35,7 @@ def check_function(self, t):
         assert_raises(Exception, t, {})
 
         if t.__doc__.split()[0] in ['t8','s8']:
-            assert_raises(OverflowError, t, 100000000000000000000000l)
+            assert_raises(OverflowError, t, 100000000000000000000000)
             assert_raises(OverflowError, t, 10000000011111111111111.23)
 
 class TestF77ReturnInteger(TestReturnInteger):

numpy/f2py/tests/test_return_logical.py

@@ -2,6 +2,7 @@
 
 from numpy.testing import *
 from numpy import array
+from numpy.compat import long
 import util
 
 class TestReturnLogical(util.F2PyTest):
@@ -15,7 +16,7 @@ def check_function(self, t):
         assert_( t(1j)==1)
         assert_( t(234)==1)
         assert_( t(234.6)==1)
-        assert_( t(234l)==1)
+        assert_( t(long(234))==1)
         assert_( t(234.6+3j)==1)
         assert_( t('234')==1)
         assert_( t('aaa')==1)
@@ -25,7 +26,7 @@ def check_function(self, t):
         assert_( t({})==0)
         assert_( t(t)==1)
         assert_( t(-234)==1)
-        assert_( t(10l**100)==1)
+        assert_( t(10**100)==1)
         assert_( t([234])==1)
         assert_( t((234,))==1)
         assert_( t(array(234))==1)

numpy/f2py/tests/test_return_real.py

@@ -2,6 +2,7 @@
 
 from numpy.testing import *
 from numpy import array
+from numpy.compat import long
 import math
 import util
 
@@ -13,7 +14,7 @@ def check_function(self, t):
             err = 0.0
         assert_( abs(t(234)-234.0)<=err)
         assert_( abs(t(234.6)-234.6)<=err)
-        assert_( abs(t(234l)-234.0)<=err)
+        assert_( abs(t(long(234))-234.0)<=err)
         assert_( abs(t('234')-234)<=err)
         assert_( abs(t('234.6')-234.6)<=err)
         assert_( abs(t(-234)+234)<=err)
@@ -42,7 +43,7 @@ def check_function(self, t):
         assert_raises(Exception, t, {})
 
         try:
-            r = t(10l**400)
+            r = t(10**400)
             assert_( repr(r) in ['inf','Infinity'],repr(r))
         except OverflowError:
             pass

numpy/lib/_iotools.py

@@ -10,11 +10,11 @@
 import numpy.core.numeric as nx
 
 if sys.version_info[0] >= 3:
-    from builtins import bool, int, long, float, complex, object, unicode, str
+    from builtins import bool, int, float, complex, object, unicode, str
 else:
-    from __builtin__ import bool, int, long, float, complex, object, unicode, str
+    from __builtin__ import bool, int, float, complex, object, unicode, str
 
-from numpy.compat import asbytes, bytes, asbytes_nested
+from numpy.compat import asbytes, bytes, asbytes_nested, long
 
 if sys.version_info[0] >= 3:
     def _bytes_to_complex(s):

numpy/lib/arraypad.py

@@ -6,6 +6,7 @@
 from __future__ import division, absolute_import, print_function
 
 import numpy as np
+from numpy.compat import long
 
 __all__ = ['pad']
 

numpy/lib/arrayterator.py

@@ -9,12 +9,14 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import sys
 from operator import mul
+from functools import reduce
+
+from numpy.compat import long
 
 __all__ = ['Arrayterator']
 
-import sys
-from functools import reduce
 
 class Arrayterator(object):
     """

numpy/lib/format.py

@@ -139,7 +139,7 @@
 import numpy
 import sys
 from numpy.lib.utils import safe_eval
-from numpy.compat import asbytes, isfileobj
+from numpy.compat import asbytes, isfileobj, long
 
 if sys.version_info[0] >= 3:
     import pickle

numpy/lib/function_base.py

@@ -32,6 +32,7 @@
 from ._compiled_base import add_newdoc_ufunc
 import numpy as np
 import collections
+from numpy.compat import long
 
 # Force range to be a generator, for np.delete's usage.
 if sys.version_info[0] < 3:

numpy/lib/tests/test__datasource.py

@@ -305,7 +305,7 @@ def test_CachedHTTPFile(self):
         # would do.
         scheme, netloc, upath, pms, qry, frg = urlparse(localfile)
         local_path = os.path.join(self.repos._destpath, netloc)
-        os.mkdir(local_path, 0700)
+        os.mkdir(local_path, 0o0700)
         tmpfile = valid_textfile(local_path)
         assert_(self.repos.exists(tmpfile))
 

numpy/lib/tests/test__iotools.py

@@ -175,11 +175,11 @@ def test_upgrademapper(self):
         StringConverter.upgrade_mapper(dateparser, date(2000, 1, 1))
         convert = StringConverter(dateparser, date(2000, 1, 1))
         test = convert(asbytes('2001-01-01'))
-        assert_equal(test, date(2001, 01, 01))
+        assert_equal(test, date(2001, 1, 1))
         test = convert(asbytes('2009-01-01'))
-        assert_equal(test, date(2009, 01, 01))
+        assert_equal(test, date(2009, 1, 1))
         test = convert(asbytes(''))
-        assert_equal(test, date(2000, 01, 01))
+        assert_equal(test, date(2000, 1, 1))
     #
     def test_string_to_object(self):
         "Make sure that string-to-object functions are properly recognized"

numpy/lib/tests/test_function_base.py

@@ -9,6 +9,7 @@
         )
 from numpy.random import rand
 from numpy.lib import *
+from numpy.compat import long
 
 
 class TestAny(TestCase):

numpy/lib/tests/test_type_check.py

@@ -3,7 +3,7 @@
 from numpy.testing import *
 from numpy.lib import *
 from numpy.core import *
-from numpy.compat import asbytes
+from numpy.compat import asbytes, long
 
 try:
     import ctypes
@@ -87,7 +87,7 @@ def test_basic(self):
         assert_(not isscalar([3]))
         assert_(not isscalar((3,)))
         assert_(isscalar(3j))
-        assert_(isscalar(10L))
+        assert_(isscalar(long(10)))
         assert_(isscalar(4.0))