diff options
Diffstat (limited to 'numpy/f2py')
-rw-r--r-- | numpy/f2py/__init__.py | 2 | ||||
-rwxr-xr-x | numpy/f2py/doc/collectinput.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py index 951544588..6b20f94c4 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -5,7 +5,7 @@ __all__ = ['run_main','compile','f2py_testing'] import os import sys -import commands +import subprocess from . import f2py2e from . import f2py_testing 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) |