diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 07:00:11 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 07:00:11 -0700 |
| commit | 688bc60658b391524c6b641e0a5e5ecd73322d02 (patch) | |
| tree | 1b210bb7361ce691e781884bf06f89c7ebd13360 /numpy/lib/_iotools.py | |
| parent | 74b08b3f0284d9d2dd55a15dd98a3846913b1b51 (diff) | |
| parent | 7f5af37e26ba2e99ad3ee6928b78437f601e96e0 (diff) | |
| download | numpy-688bc60658b391524c6b641e0a5e5ecd73322d02.tar.gz | |
Merge pull request #3232 from charris/2to3-apply-numliterals-fixer
2to3: Apply the `numliterals` fixer and skip the `long` fixer.
Diffstat (limited to 'numpy/lib/_iotools.py')
| -rw-r--r-- | numpy/lib/_iotools.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index 9eaf4d78f..dc143415e 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -10,11 +10,11 @@ import numpy as np 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): |