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, 7 insertions, 4 deletions

diff --git a/numpy/lib/user_array.py b/numpy/lib/user_array.py
index 1cc1345aa..d675d3702 100644
--- a/numpy/lib/user_array.py
+++ b/numpy/lib/user_array.py
@@ -6,10 +6,13 @@ complete.
 """
 from __future__ import division, absolute_import, print_function
 
-from numpy.core import array, asarray, absolute, add, subtract, multiply, \
-     divide, remainder, power, left_shift, right_shift, bitwise_and, \
-     bitwise_or, bitwise_xor, invert, less, less_equal, not_equal, equal, \
-     greater, greater_equal, shape, reshape, arange, sin, sqrt, transpose
+from numpy.core import (
+        array, asarray, absolute, add, subtract, multiply, divide,
+        remainder, power, left_shift, right_shift, bitwise_and, bitwise_or,
+        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(object):
     def __init__(self, data, dtype=None, copy=True):