From 7f5af37e26ba2e99ad3ee6928b78437f601e96e0 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Thu, 11 Apr 2013 14:31:52 -0600 Subject: 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. --- numpy/lib/arrayterator.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'numpy/lib/arrayterator.py') diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py index 761d63749..094d41c11 100644 --- a/numpy/lib/arrayterator.py +++ b/numpy/lib/arrayterator.py @@ -9,12 +9,14 @@ a user-specified number of elements. """ 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): """ -- cgit v1.2.1