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

The numliterals fixer replaces the old style octal number like '01' by
'0o1' removes the 'L' suffix.

Octal values were previously mistakenly specified in some dates, those
uses have been corrected by removing the leading zeros.

Simply Removing the 'L' suffix should not be a problem, but in some
testing code it looks neccesary, so in those places the Python long
constructor is used instead.

The 'long' type is no longer defined in Python 3. Because we need to
have it defined for Python 2 it is added to numpy/compat/np3k.py where
it is defined as 'int' for Python 3 and 'long' for Python 2. The `long`
fixer then needs to be skipped so that it doesn't undo the good work.

Closes #3074, #3067.

1 files changed, 8 insertions, 1 deletions

diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
index 4a7866a56..f45a9973f 100644
--- a/numpy/compat/py3k.py
+++ b/numpy/compat/py3k.py
@@ -6,12 +6,14 @@ from __future__ import division, absolute_import, print_function
 
 __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 @@ if sys.version_info[0] >= 3:
 
     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 @@ else:
     def open_latin1(filename, mode='r'):
         return open(filename, mode=mode)
 
+
 def getexception():
     return sys.exc_info()[1]