Merge pull request numpy#19775 from HaoZeke/minor_typos_dated

MAINT,DOC: Readability improvements and cleanup for f2py

Author: charris

doc/source/f2py/distutils.rst

@@ -66,12 +66,12 @@ Extensions to ``distutils``
 * When building Python packages containing Fortran sources, one
   can choose different Fortran compilers by using the ``build_ext``
   command option ``--fcompiler=<Vendor>``. Here ``<Vendor>`` can be one of the
-  following names::
+  following names (on ``linux`` systems)::
 
-    absoft sun mips intel intelv intele intelev nag compaq compaqv gnu vast pg hpux
+    absoft compaq fujitsu g95 gnu gnu95 intel intele intelem lahey nag nagfor nv pathf95 pg vast
 
   See ``numpy_distutils/fcompiler.py`` for an up-to-date list of
-  supported compilers or run
+  supported compilers for different platforms, or run
 
   ::
 

numpy/f2py/__main__.py

@@ -1,4 +1,5 @@
-# See http://cens.ioc.ee/projects/f2py2e/
+# See:
+# https://web.archive.org/web/20140822061353/http://cens.ioc.ee/projects/f2py2e
 from numpy.f2py.f2py2e import main
 
 main()

numpy/f2py/auxfuncs.py

@@ -347,9 +347,9 @@ def iscomplexfunction_warn(rout):
     **************************************************************
         Warning: code with a function returning complex value
         may not work correctly with your Fortran compiler.
-        Run the following test before using it in your applications:
-        $(f2py install dir)/test-site/{b/runme_scalar,e/runme}
-        When using GNU gcc/g77 compilers, codes should work correctly.
+        When using GNU gcc/g77 compilers, codes should work
+        correctly for callbacks with:
+        f2py -c -DF2PY_CB_RETURNCOMPLEX
     **************************************************************\n""")
         return 1
     return 0

numpy/f2py/capi_maps.py

@@ -48,7 +48,7 @@
             'unsigned_char': 'int',                    # forced casting
             'short': 'int',                            # forced casting
             'unsigned_short': 'int',                   # forced casting
-            'int': 'int',                              # (forced casting)
+            'int': 'int',                              # forced casting
             'long': 'int',
             'long_long': 'long',
             'unsigned': 'int',                         # forced casting
@@ -95,8 +95,8 @@
                   'complex_double': 'NPY_CDOUBLE',
                   'complex_long_double': 'NPY_CDOUBLE',
                   'string':'NPY_STRING'
-
                   }
+
 c2pycode_map = {'double': 'd',
                 'float': 'f',
                 'long_double': 'd',                       # forced casting
@@ -114,6 +114,7 @@
                 'complex_long_double': 'D',               # forced casting
                 'string': 'c'
                 }
+
 if using_newcore:
     c2pycode_map = {'double': 'd',
                     'float': 'f',
@@ -133,6 +134,7 @@
                     'complex_double': 'D',
                     'complex_long_double': 'G',
                     'string': 'S'}
+
 c2buildvalue_map = {'double': 'd',
                     'float': 'f',
                     'char': 'b',
@@ -146,10 +148,6 @@
                     'complex_long_double': 'N',
                     'string': 'y'}
 
-if using_newcore:
-    # c2buildvalue_map=???
-    pass
-
 f2cmap_all = {'real': {'': 'float', '4': 'float', '8': 'double',
                        '12': 'long_double', '16': 'long_double'},
               'integer': {'': 'int', '1': 'signed_char', '2': 'short',
@@ -185,22 +183,22 @@ def load_f2cmap_file(f2cmap_file):
             return
 
     # User defined additions to f2cmap_all.
-    # f2cmap_file must contain a dictionary of dictionaries, only.  For
+    # f2cmap_file must contain a dictionary of dictionaries, only. For
     # example, {'real':{'low':'float'}} means that Fortran 'real(low)' is
-    # interpreted as C 'float'.  This feature is useful for F90/95 users if
-    # they use PARAMETERSs in type specifications.
+    # interpreted as C 'float'. This feature is useful for F90/95 users if
+    # they use PARAMETERS in type specifications.
     try:
         outmess('Reading f2cmap from {!r} ...\n'.format(f2cmap_file))
         with open(f2cmap_file, 'r') as f:
             d = eval(f.read(), {}, {})
-        for k, d1 in list(d.items()):
-            for k1 in list(d1.keys()):
+        for k, d1 in d.items():
+            for k1 in d1.keys():
                 d1[k1.lower()] = d1[k1]
             d[k.lower()] = d[k]
-        for k in list(d.keys()):
+        for k in d.keys():
             if k not in f2cmap_all:
                 f2cmap_all[k] = {}
-            for k1 in list(d[k].keys()):
+            for k1 in d[k].keys():
                 if d[k][k1] in c2py_map:
                     if k1 in f2cmap_all[k]:
                         outmess(
@@ -279,11 +277,9 @@ def getctype(var):
                         errmess('getctype: "%s(kind=%s)" is mapped to C "%s" (to override define dict(%s = dict(%s="<C typespec>")) in %s/.f2py_f2cmap file).\n'
                                 % (typespec, var['kindselector']['kind'], ctype,
                                    typespec, var['kindselector']['kind'], os.getcwd()))
-
     else:
         if not isexternal(var):
-            errmess(
-                'getctype: No C-type found in "%s", assuming void.\n' % var)
+            errmess('getctype: No C-type found in "%s", assuming void.\n' % var)
     return ctype
 
 
@@ -523,7 +519,7 @@ def sign2map(a, var):
         if f(var):
             intent_flags.append('F2PY_%s' % s)
     if intent_flags:
-        # XXX: Evaluate intent_flags here.
+        # TODO: Evaluate intent_flags here.
         ret['intent'] = '|'.join(intent_flags)
     else:
         ret['intent'] = 'F2PY_INTENT_IN'

numpy/f2py/crackfortran.py

@@ -245,7 +245,6 @@ def outmess(line, flag=1):
     defaultimplicitrules[c] = {'typespec': 'real'}
 for c in "ijklmn":
     defaultimplicitrules[c] = {'typespec': 'integer'}
-del c
 badnames = {}
 invbadnames = {}
 for n in ['int', 'double', 'float', 'char', 'short', 'long', 'void', 'case', 'while',
@@ -3357,7 +3356,8 @@ def crack2fortran(block):
 """
     footer = """
 ! This file was auto-generated with f2py (version:%s).
-! See http://cens.ioc.ee/projects/f2py2e/
+! See:
+! https://web.archive.org/web/20140822061353/http://cens.ioc.ee/projects/f2py2e
 """ % (f2py_version)
     return header + pyf + footer
 

numpy/f2py/f2py2e.py

@@ -168,7 +168,7 @@
 Requires:    Python 3.5 or higher.
 License:     NumPy license (see LICENSE.txt in the NumPy source code)
 Copyright 1999 - 2011 Pearu Peterson all rights reserved.
-http://cens.ioc.ee/projects/f2py2e/"""
+https://web.archive.org/web/20140822061353/http://cens.ioc.ee/projects/f2py2e"""
 
 
 def scaninputline(inputline):

numpy/f2py/setup.py

@@ -39,8 +39,6 @@ def configuration(parent_package='', top_path=None):
     config = configuration(top_path='')
     config = config.todict()
 
-    config['download_url'] = "http://cens.ioc.ee/projects/f2py2e/2.x"\
-                             "/F2PY-2-latest.tar.gz"
     config['classifiers'] = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -68,6 +66,7 @@ def configuration(parent_package='', top_path=None):
 wrapping Fortran 77/90/95 subroutines, accessing common blocks from
 Python, and calling Python functions from Fortran (call-backs).
 Interfacing subroutines/data from Fortran 90/95 modules is supported.""",
-          url="http://cens.ioc.ee/projects/f2py2e/",
+          url="https://web.archive.org/web/20140822061353/"\
+          "http://cens.ioc.ee/projects/f2py2e/",
           keywords=['Fortran', 'f2py'],
           **config)