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 /tools | |
| 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 'tools')
| -rwxr-xr-x | tools/py3tool.py | 3 | ||||
| -rw-r--r-- | tools/win32build/build.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/py3tool.py b/tools/py3tool.py index 656327450..d7fc94240 100755 --- a/tools/py3tool.py +++ b/tools/py3tool.py @@ -77,7 +77,8 @@ FIXES_TO_SKIP = [ 'raw_input', 'xreadlines', 'xrange', - 'import' + 'import', + 'imports' ] skip_fixes= [] diff --git a/tools/win32build/build.py b/tools/win32build/build.py index 43d8a395d..dc12e807d 100644 --- a/tools/win32build/build.py +++ b/tools/win32build/build.py @@ -88,8 +88,12 @@ def move_binary(arch, pyver): os.path.join("binaries", get_binary_name(arch))) def get_numpy_version(): - import __builtin__ - __builtin__.__NUMPY_SETUP__ = True + if sys.version_info[0] >= 3: + import builtins + else: + import __builtin__ as builtins + + builtins.__NUMPY_SETUP__ = True from numpy.version import version return version |