diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-21 20:25:35 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-21 20:25:35 -0700 |
| commit | ee19043127784e579a45ceb2f02ff350ec8b6019 (patch) | |
| tree | c5444ffc894d43d314ec2026ced8723c577ffc44 /numpy/lib/_iotools.py | |
| parent | 56e806abb78ac03a5f45090a3b9bf7a6c9964026 (diff) | |
| parent | 211154eb336f5314b33e2486fa79953c90be8a11 (diff) | |
| download | numpy-ee19043127784e579a45ceb2f02ff350ec8b6019.tar.gz | |
Merge pull request #3257 from charris/2to3-apply-unicode-fixer
2to3: Apply unicode fixer.
Diffstat (limited to 'numpy/lib/_iotools.py')
| -rw-r--r-- | numpy/lib/_iotools.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index 827adac02..aa39e25a1 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -11,7 +11,8 @@ 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 + from builtins import bool, int, float, complex, object, str + unicode = str else: from __builtin__ import bool, int, float, complex, object, unicode, str |