diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 07:42:08 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 07:42:08 -0700 |
| commit | 49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b (patch) | |
| tree | e71c0d8f6123307860a58796ed840bf32526b3fe /numpy/lib/_iotools.py | |
| parent | 3c8fc14665548c71a9cd144b2e16d9309a92e255 (diff) | |
| parent | 4394515cd5632a7f110993ff75033d407d10861d (diff) | |
| download | numpy-49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b.tar.gz | |
Merge pull request #3191 from charris/2to3-apply-imports-fixer
2to3: Apply `imports` fixer.
Diffstat (limited to 'numpy/lib/_iotools.py')
| -rw-r--r-- | numpy/lib/_iotools.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index 8054c2662..f3097be23 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -8,7 +8,11 @@ __docformat__ = "restructuredtext en" import sys import numpy as np import numpy.core.numeric as nx -from __builtin__ import bool, int, long, float, complex, object, unicode, str + +if sys.version_info[0] >= 3: + from builtins import bool, int, long, float, complex, object, unicode, str +else: + from __builtin__ import bool, int, long, float, complex, object, unicode, str from numpy.compat import asbytes, bytes, asbytes_nested |