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, 3 insertions, 2 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index 871a10afb..0689bc08a 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -159,13 +159,14 @@ 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 *
     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