diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:15:26 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:15:26 -0700 |
| commit | 01ed88af5b784d52f4fcf383e319cde67c8a22fb (patch) | |
| tree | 91736aafb0da995afee4170619196a87b4177f02 /numpy/lib/_iotools.py | |
| parent | e589c6ed1dac7755bb7bd9e181a43ebeff62dcec (diff) | |
| parent | 68338eed3ae91c9846142e088c16b63635e58178 (diff) | |
| download | numpy-01ed88af5b784d52f4fcf383e319cde67c8a22fb.tar.gz | |
Merge pull request #3237 from charris/2to3-apply-basestring
2to3: Apply basestring fixer.
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): |