diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:05:31 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 09:05:31 -0600 |
| commit | 68338eed3ae91c9846142e088c16b63635e58178 (patch) | |
| tree | adaec2f35174f838edbc932921eccac10c7c3886 /numpy/lib/_iotools.py | |
| parent | 688bc60658b391524c6b641e0a5e5ecd73322d02 (diff) | |
| download | numpy-68338eed3ae91c9846142e088c16b63635e58178.tar.gz | |
2to3: Apply basestring fixer.
The basestring class is not defined in Python 3 and the fixer replaces
it with str. In order to have a common code base we define basestring in
numpy/compat/py3k.py to be str when the Python version is >= 3,
otherwise basestring and import it where needed. That works for most
cases, but there are a few files where the version dependent define
needs to be in the file.
Closes #3042.
Diffstat (limited to 'numpy/lib/_iotools.py')
| -rw-r--r-- | numpy/lib/_iotools.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index dc143415e..4dedaadcd 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -8,13 +8,13 @@ __docformat__ = "restructuredtext en" import sys import numpy as np import numpy.core.numeric as nx +from numpy.compat import asbytes, bytes, asbytes_nested, long, basestring if sys.version_info[0] >= 3: from builtins import bool, int, float, complex, object, unicode, str else: from __builtin__ import bool, int, float, complex, object, unicode, str -from numpy.compat import asbytes, bytes, asbytes_nested, long if sys.version_info[0] >= 3: def _bytes_to_complex(s): |