diff options
Diffstat (limited to 'numpy/f2py')
32 files changed, 122 insertions, 122 deletions
diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py index 6b20f94c4..26a63daa8 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['run_main','compile','f2py_testing'] diff --git a/numpy/f2py/__version__.py b/numpy/f2py/__version__.py index 44791aa37..49a2199bf 100644 --- a/numpy/f2py/__version__.py +++ b/numpy/f2py/__version__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function major = 2 diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py index 5b13747f1..608ae5566 100644 --- a/numpy/f2py/auxfuncs.py +++ b/numpy/f2py/auxfuncs.py @@ -14,7 +14,7 @@ $Date: 2005/07/24 19:01:55 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.65 $"[10:-1] diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py index 117ea2233..1aa67ff74 100644 --- a/numpy/f2py/capi_maps.py +++ b/numpy/f2py/capi_maps.py @@ -11,7 +11,7 @@ $Date: 2005/05/06 10:57:33 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.60 $"[10:-1] diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py index bc565a904..eb8cc6fc6 100644 --- a/numpy/f2py/cb_rules.py +++ b/numpy/f2py/cb_rules.py @@ -13,7 +13,7 @@ $Date: 2005/07/20 11:27:58 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.53 $"[10:-1] diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index a0110c530..a83046aa3 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -14,7 +14,7 @@ $Date: 2005/05/06 11:42:34 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.75 $"[10:-1] @@ -1214,7 +1214,7 @@ def get_needs(): del outneeds[n][0] if saveout and (0 not in map(lambda x,y:x==y,saveout,outneeds[n])) \ and outneeds[n] != []: - print n,saveout + print(n,saveout) errmess('get_needs: no progress in sorting needs, probably circular dependence, skipping.\n') out=out+saveout break diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py index aec0ef1b1..ed733a706 100644 --- a/numpy/f2py/common_rules.py +++ b/numpy/f2py/common_rules.py @@ -13,7 +13,7 @@ $Date: 2005/05/06 10:57:33 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.19 $"[10:-1] diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 2a7f137d2..97a58813e 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -138,7 +138,7 @@ TODO: The above may be solved by creating appropriate preprocessor program, for example. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.177 $"[10:-1] import platform @@ -922,7 +922,7 @@ def analyzeline(m,case,line): if not m1: if case in ['public','private']: k='' else: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: no name pattern found in %s statement for %s. Skipping.\n'%(case,`e`)) continue else: @@ -1158,7 +1158,7 @@ def analyzeline(m,case,line): else: pass else: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: Could not crack the use statement.\n') elif case in ['f2pyenhancements']: if 'f2pyenhancements' not in groupcache[groupcounter]: @@ -1182,7 +1182,7 @@ def analyzeline(m,case,line): m.group('this')) else: if verbose>1: - print m.groupdict() + print(m.groupdict()) outmess('analyzeline: No code implemented for line.\n') def appendmultiline(group, context_name,ml): @@ -2046,7 +2046,7 @@ def get_parameters(vars, global_params={}): if nl!=n: params[nl] = params[n] else: - print vars[n] + print(vars[n]) outmess('get_parameters:parameter %s does not have value?!\n'%(`n`)) return params diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py index 59ef5205b..f00c3f0ac 100644 --- a/numpy/f2py/diagnose.py +++ b/numpy/f2py/diagnose.py @@ -1,43 +1,43 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys import tempfile def run_command(cmd): - print 'Running %r:' % (cmd) + print('Running %r:' % (cmd)) s = os.system(cmd) - print '------' + print('------') def run(): _path = os.getcwd() os.chdir(tempfile.gettempdir()) - print '------' - print 'os.name=%r' % (os.name) - print '------' - print 'sys.platform=%r' % (sys.platform) - print '------' - print 'sys.version:' - print sys.version - print '------' - print 'sys.prefix:' - print sys.prefix - print '------' - print 'sys.path=%r' % (':'.join(sys.path)) - print '------' + print('------') + print('os.name=%r' % (os.name)) + print('------') + print('sys.platform=%r' % (sys.platform)) + print('------') + print('sys.version:') + print(sys.version) + print('------') + print('sys.prefix:') + print(sys.prefix) + print('------') + print('sys.path=%r' % (':'.join(sys.path))) + print('------') try: import numpy has_newnumpy = 1 except ImportError: - print 'Failed to import new numpy:', sys.exc_info()[1] + print('Failed to import new numpy:', sys.exc_info()[1]) has_newnumpy = 0 try: from numpy.f2py import f2py2e has_f2py2e = 1 except ImportError: - print 'Failed to import f2py2e:',sys.exc_info()[1] + print('Failed to import f2py2e:',sys.exc_info()[1]) has_f2py2e = 0 try: @@ -48,102 +48,102 @@ def run(): import numpy_distutils has_numpy_distutils = 1 except ImportError: - print 'Failed to import numpy_distutils:',sys.exc_info()[1] + print('Failed to import numpy_distutils:',sys.exc_info()[1]) has_numpy_distutils = 0 if has_newnumpy: try: - print 'Found new numpy version %r in %s' % \ - (numpy.__version__, numpy.__file__) + print('Found new numpy version %r in %s' % \ + (numpy.__version__, numpy.__file__)) except Exception as msg: - print 'error:', msg - print '------' + print('error:', msg) + print('------') if has_f2py2e: try: - print 'Found f2py2e version %r in %s' % \ - (f2py2e.__version__.version,f2py2e.__file__) + print('Found f2py2e version %r in %s' % \ + (f2py2e.__version__.version,f2py2e.__file__)) except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') if has_numpy_distutils: try: if has_numpy_distutils == 2: - print 'Found numpy.distutils version %r in %r' % (\ + print('Found numpy.distutils version %r in %r' % (\ numpy.distutils.__version__, - numpy.distutils.__file__) + numpy.distutils.__file__)) else: - print 'Found numpy_distutils version %r in %r' % (\ + print('Found numpy_distutils version %r in %r' % (\ numpy_distutils.numpy_distutils_version.numpy_distutils_version, - numpy_distutils.__file__) - print '------' + numpy_distutils.__file__)) + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') try: if has_numpy_distutils == 1: - print 'Importing numpy_distutils.command.build_flib ...', + print('Importing numpy_distutils.command.build_flib ...', end=' ') import numpy_distutils.command.build_flib as build_flib - print 'ok' - print '------' + print('ok') + print('------') try: - print 'Checking availability of supported Fortran compilers:' + print('Checking availability of supported Fortran compilers:') for compiler_class in build_flib.all_compilers: compiler_class(verbose=1).is_available() - print '------' + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') except Exception as msg: - print 'error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)' - print '------' + print('error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)') + print('------') try: if has_numpy_distutils == 2: - print 'Importing numpy.distutils.fcompiler ...', + print('Importing numpy.distutils.fcompiler ...', end=' ') import numpy.distutils.fcompiler as fcompiler else: - print 'Importing numpy_distutils.fcompiler ...', + print('Importing numpy_distutils.fcompiler ...', end=' ') import numpy_distutils.fcompiler as fcompiler - print 'ok' - print '------' + print('ok') + print('------') try: - print 'Checking availability of supported Fortran compilers:' + print('Checking availability of supported Fortran compilers:') fcompiler.show_fcompilers() - print '------' + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') try: if has_numpy_distutils == 2: - print 'Importing numpy.distutils.cpuinfo ...', + print('Importing numpy.distutils.cpuinfo ...', end=' ') from numpy.distutils.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') else: try: - print 'Importing numpy_distutils.command.cpuinfo ...', + print('Importing numpy_distutils.command.cpuinfo ...', end=' ') from numpy_distutils.command.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') except Exception as msg: - print 'error:',msg,'(ignore it)' - print 'Importing numpy_distutils.cpuinfo ...', + print('error:',msg,'(ignore it)') + print('Importing numpy_distutils.cpuinfo ...', end=' ') from numpy_distutils.cpuinfo import cpuinfo - print 'ok' - print '------' + print('ok') + print('------') cpu = cpuinfo() - print 'CPU information:', + print('CPU information:', end=' ') for name in dir(cpuinfo): if name[0]=='_' and name[1]!='_' and getattr(cpu,name[1:])(): - print name[1:], - print '------' + print(name[1:], end=' ') + print('------') except Exception as msg: - print 'error:',msg - print '------' + print('error:',msg) + print('------') os.chdir(_path) if __name__ == "__main__": run() diff --git a/numpy/f2py/doc/collectinput.py b/numpy/f2py/doc/collectinput.py index 396e4a912..317fde5b2 100755 --- a/numpy/f2py/doc/collectinput.py +++ b/numpy/f2py/doc/collectinput.py @@ -19,7 +19,7 @@ Usage: collectinput # in and out are stdin and stdout """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "0.0" @@ -68,16 +68,16 @@ for l in fileinput.input(fi): except: flag=0 if flag==0: sys.stderr.write('Could not open a file: '+fn+'\n') - print l+l1 + print(l+l1) continue elif flag==1: sys.stderr.write(fn+'\n') - print '%%%%% Begin of '+fn - print getoutput(sys.argv[0]+' < '+fn) - print '%%%%% End of '+fn + print('%%%%% Begin of '+fn) + print(getoutput(sys.argv[0]+' < '+fn)) + print('%%%%% End of '+fn) else: sys.stderr.write('Could not extract a file name from: '+l) - print l+l1 + print(l+l1) else: - print l+l1 + print(l+l1) sys.stdout.close() diff --git a/numpy/f2py/docs/pytest.py b/numpy/f2py/docs/pytest.py index 40d6b0c5e..b61a607fe 100644 --- a/numpy/f2py/docs/pytest.py +++ b/numpy/f2py/docs/pytest.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function #File: pytest.py import Numeric diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py index e80bc493b..8dfaa7a52 100644 --- a/numpy/f2py/docs/usersguide/setup_example.py +++ b/numpy/f2py/docs/usersguide/setup_example.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # File: setup_example.py diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py index aee8afba0..0886e8ebf 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -14,7 +14,7 @@ $Date: 2005/05/06 08:31:19 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from . import __version__ f2py_version = __version__.version @@ -212,7 +212,7 @@ def scaninputline(inputline): elif l=='-h': f2=1 elif l=='-m': f3=1 elif l[:2]=='-v': - print f2py_version + print(f2py_version) sys.exit() elif l=='--show-compilers': f5=1 @@ -242,7 +242,7 @@ def scaninputline(inputline): elif f==-1: skipfuncs.append(l) elif f==0: onlyfuncs.append(l) if not f5 and not files and not modulename: - print __usage__ + print(__usage__) sys.exit() if not os.path.isdir(buildpath): if not verbose: @@ -477,7 +477,7 @@ def run_compile(): nv = vmap[ov] except KeyError: if ov not in vmap.values(): - print 'Unknown vendor: "%s"' % (s[len(v):]) + print('Unknown vendor: "%s"' % (s[len(v):])) nv = ov i = flib_flags.index(s) flib_flags[i] = '--fcompiler=' + nv @@ -533,7 +533,7 @@ def run_compile(): if len(name_value)==2: define_macros[i] = tuple(name_value) else: - print 'Invalid use of -D:',name_value + print('Invalid use of -D:',name_value) from numpy.distutils.system_info import get_info diff --git a/numpy/f2py/f2py_testing.py b/numpy/f2py/f2py_testing.py index b0f396ad4..e5ba8a9d5 100644 --- a/numpy/f2py/f2py_testing.py +++ b/numpy/f2py/f2py_testing.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re @@ -34,13 +34,13 @@ def run(runtest,test_functions,repeat=1): else: diff_memusage2 = memusage() - start_memusage if diff_memusage2!=diff_memusage: - print 'memory usage change at step %i:' % i,\ + print('memory usage change at step %i:' % i,\ diff_memusage2-diff_memusage,\ - fname + fname) diff_memusage = diff_memusage2 current_memusage = memusage() - print 'run',repeat*len(test_functions),'tests',\ - 'in %.2f seconds' % ((jiffies()-start_jiffies)/100.0) + print('run',repeat*len(test_functions),'tests',\ + 'in %.2f seconds' % ((jiffies()-start_jiffies)/100.0)) if start_memusage: - print 'initial virtual memory size:',start_memusage,'bytes' - print 'current virtual memory size:',current_memusage,'bytes' + print('initial virtual memory size:',start_memusage,'bytes') + print('current virtual memory size:',current_memusage,'bytes') diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py index bc571371b..c251b2340 100644 --- a/numpy/f2py/f90mod_rules.py +++ b/numpy/f2py/f90mod_rules.py @@ -13,7 +13,7 @@ $Date: 2005/02/03 19:30:23 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.27 $"[10:-1] @@ -171,7 +171,7 @@ def buildhooks(pymod): if hasbody(m): for b in m['body']: if not isroutine(b): - print 'Skipping',b['block'],b['name'] + print('Skipping',b['block'],b['name']) continue modobjs.append('%s()'%(b['name'])) b['modulename'] = m['name'] diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py index 7597e43ae..f69750dd0 100644 --- a/numpy/f2py/func2subr.py +++ b/numpy/f2py/func2subr.py @@ -13,7 +13,7 @@ $Date: 2004/11/26 11:13:06 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.16 $"[10:-1] diff --git a/numpy/f2py/info.py b/numpy/f2py/info.py index 07a750588..c895c5de2 100644 --- a/numpy/f2py/info.py +++ b/numpy/f2py/info.py @@ -1,6 +1,6 @@ """Fortran to Python Interface Generator. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function postpone_import = True diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index 38c43b4ae..0165a9e72 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -50,7 +50,7 @@ $Date: 2005/08/30 08:58:42 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.129 $"[10:-1] diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py index 43de25225..1fae54531 100644 --- a/numpy/f2py/setup.py +++ b/numpy/f2py/setup.py @@ -16,7 +16,7 @@ $Date: 2005/01/30 17:22:14 $ Pearu Peterson """ -from __future__ import division +from __future__ import division, print_function __version__ = "$Id: setup.py,v 1.32 2005/01/30 17:22:14 pearu Exp $" diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py index 586833e68..773dd75a1 100644 --- a/numpy/f2py/tests/test_array_from_pyobj.py +++ b/numpy/f2py/tests/test_array_from_pyobj.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import unittest import os diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py index 19a557530..f3a840272 100644 --- a/numpy/f2py/tests/test_assumed_shape.py +++ b/numpy/f2py/tests/test_assumed_shape.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py index 51b1bb1b4..6ae473ac7 100644 --- a/numpy/f2py/tests/test_callback.py +++ b/numpy/f2py/tests/test_callback.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py index d24099b05..493c06942 100644 --- a/numpy/f2py/tests/test_kind.py +++ b/numpy/f2py/tests/test_kind.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py index d62098ab4..c4cb4889b 100644 --- a/numpy/f2py/tests/test_mixed.py +++ b/numpy/f2py/tests/test_mixed.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py index 5a68bec72..97378959f 100644 --- a/numpy/f2py/tests/test_return_character.py +++ b/numpy/f2py/tests/test_return_character.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py index 00ba1cfe6..14bf8f6ad 100644 --- a/numpy/f2py/tests/test_return_complex.py +++ b/numpy/f2py/tests/test_return_complex.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py index 6c55cc1b9..77d26dcc7 100644 --- a/numpy/f2py/tests/test_return_integer.py +++ b/numpy/f2py/tests/test_return_integer.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py index af35c50d1..42a502806 100644 --- a/numpy/f2py/tests/test_return_logical.py +++ b/numpy/f2py/tests/test_return_logical.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py index 0ea4373fb..dfa4d68c9 100644 --- a/numpy/f2py/tests/test_return_real.py +++ b/numpy/f2py/tests/test_return_real.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy import array diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py index 1a41ce972..75398060b 100644 --- a/numpy/f2py/tests/test_size.py +++ b/numpy/f2py/tests/test_size.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import math diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py index 0da4bc310..56aff2b66 100644 --- a/numpy/f2py/tests/util.py +++ b/numpy/f2py/tests/util.py @@ -5,7 +5,7 @@ Utility functions for - detecting if compilers are present """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py index c027baef8..fc3843126 100644 --- a/numpy/f2py/use_rules.py +++ b/numpy/f2py/use_rules.py @@ -15,7 +15,7 @@ $Date: 2000/09/10 12:35:43 $ Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __version__ = "$Revision: 1.3 $"[10:-1] @@ -104,6 +104,6 @@ def buildusevar(name,realname,vars,usemodulename): rd=dictappend({},vrd) var=vars[realname] - print name,realname,vars[realname] + print(name,realname,vars[realname]) ret=applyrules(usemodule_rules,rd) return ret |