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/f2py/doc/collectinput.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/f2py/doc/collectinput.py')
-rwxr-xr-x | numpy/f2py/doc/collectinput.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/f2py/doc/collectinput.py b/numpy/f2py/doc/collectinput.py index 078da8eeb..396e4a912 100755 --- a/numpy/f2py/doc/collectinput.py +++ b/numpy/f2py/doc/collectinput.py @@ -27,7 +27,11 @@ stdoutflag=0 import sys import fileinput import re -import commands + +if sys.version_info[0] >= 3: + from subprocess import getoutput +else: + from commands import getoutput try: fn=sys.argv[2] except: @@ -69,7 +73,7 @@ for l in fileinput.input(fi): elif flag==1: sys.stderr.write(fn+'\n') print '%%%%% Begin of '+fn - print commands.getoutput(sys.argv[0]+' < '+fn) + print getoutput(sys.argv[0]+' < '+fn) print '%%%%% End of '+fn else: sys.stderr.write('Could not extract a file name from: '+l) |