Merge pull request numpy#7791 from bertrand-l/feature/f2py-issues-7683

f2py.compile issues (numpy#7683)

Author: charris

numpy/_import_tools.py

@@ -52,7 +52,7 @@ def _get_info_files(self, package_dir, parent_path, parent_package=None):
     def _init_info_modules(self, packages=None):
         """Initialize info_modules = {<package_name>: <package info.py module>}.
         """
-        import imp
+        from numpy.compat import npy_load_module
         info_files = []
         info_modules = self.info_modules
 
@@ -86,8 +86,7 @@ def _init_info_modules(self, packages=None):
                 filedescriptor = ('.py', 'U', 1)
 
             try:
-                info_module = imp.load_module(fullname+'.info',
-                                              open(info_file, filedescriptor[1]),
+                info_module = npy_load_module(fullname + '.info',
                                               info_file,
                                               filedescriptor)
             except Exception as msg:

numpy/compat/py3k.py

@@ -7,7 +7,7 @@
 __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar',
            'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested',
            'asstr', 'open_latin1', 'long', 'basestring', 'sixu',
-           'integer_types', 'is_pathlib_path', 'Path']
+           'integer_types', 'is_pathlib_path', 'npy_load_module', 'Path']
 
 import sys
 try:
@@ -91,9 +91,66 @@ def asunicode_nested(x):
     else:
         return asunicode(x)
 
-
 def is_pathlib_path(obj):
     """
     Check whether obj is a pathlib.Path object.
     """
     return Path is not None and isinstance(obj, Path)
+
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 4:
+    def npy_load_module(name, fn, info=None):
+        """
+        Load a module.
+
+        .. versionadded:: 1.11.2
+
+        Parameters
+        ----------
+        name : str
+            Full module name.
+        fn : str
+            Path to module file.
+        info : tuple, optional
+            Only here for backward compatibility with Python 2.*.
+
+        Returns
+        -------
+        mod : module
+
+        """
+        import importlib
+        return importlib.machinery.SourceFileLoader(name, fn).load_module()
+else:
+    def npy_load_module(name, fn, info=None):
+        """
+        Load a module.
+
+        .. versionadded:: 1.11.2
+
+        Parameters
+        ----------
+        name : str
+            Full module name.
+        fn : str
+            Path to module file.
+        info : tuple, optional
+            Information as returned by `imp.find_module`
+            (suffix, mode, type).
+
+        Returns
+        -------
+        mod : module
+
+        """
+        import imp
+        import os
+        if info is None:
+            path = os.path.dirname(fn)
+            fo, fn, info = imp.find_module(name, [path])
+        else:
+            fo = open(fn, info[1])
+        try:
+            mod = imp.load_module(name, fo, fn, info)
+        finally:
+            fo.close()
+        return mod

numpy/distutils/misc_util.py

@@ -3,7 +3,6 @@
 import os
 import re
 import sys
-import imp
 import copy
 import glob
 import atexit
@@ -40,6 +39,7 @@ def clean_up_temporary_directory():
 
 from numpy.distutils.compat import get_exception
 from numpy.compat import basestring
+from numpy.compat import npy_load_module
 
 __all__ = ['Configuration', 'get_numpy_include_dirs', 'default_config_dict',
            'dict_append', 'appendpath', 'generate_config_py',
@@ -876,14 +876,11 @@ def _get_configuration_from_setup_py(self, setup_py,
         # In case setup_py imports local modules:
         sys.path.insert(0, os.path.dirname(setup_py))
         try:
-            fo_setup_py = open(setup_py, 'U')
             setup_name = os.path.splitext(os.path.basename(setup_py))[0]
             n = dot_join(self.name, subpackage_name, setup_name)
-            setup_module = imp.load_module('_'.join(n.split('.')),
-                                           fo_setup_py,
+            setup_module = npy_load_module('_'.join(n.split('.')),
                                            setup_py,
                                            ('.py', 'U', 1))
-            fo_setup_py.close()
             if not hasattr(setup_module, 'configuration'):
                 if not self.options['assume_default_configuration']:
                     self.warn('Assuming default configuration '\
@@ -1913,11 +1910,12 @@ def get_version(self, version_file=None, version_variable=None):
         for f in files:
             fn = njoin(self.local_path, f)
             if os.path.isfile(fn):
-                info = (open(fn), fn, ('.py', 'U', 1))
+                info = ('.py', 'U', 1)
                 name = os.path.splitext(os.path.basename(fn))[0]
                 n = dot_join(self.name, name)
                 try:
-                    version_module = imp.load_module('_'.join(n.split('.')),*info)
+                    version_module = npy_load_module('_'.join(n.split('.')),
+                                                     fn, info)
                 except ImportError:
                     msg = get_exception()
                     self.warn(str(msg))

numpy/f2py/__init__.py

@@ -22,25 +22,32 @@ def compile(source,
             verbose=True,
             source_fn=None,
             extension='.f'
-            ):
-    ''' Build extension module from processing source with f2py.
+           ):
+    """
+    Build extension module from processing source with f2py.
 
     Parameters
     ----------
     source : str
         Fortran source of module / subroutine to compile
     modulename : str, optional
-        the name of compiled python module
-    extra_args: str, optional
-        additional parameters passed to f2py
-    verbose: bool, optional
-        print f2py output to screen
-    extension: {'.f', '.f90'}, optional
-        filename extension influences the fortran compiler behavior
+        The name of the compiled python module
+    extra_args : str, optional
+        Additional parameters passed to f2py
+    verbose : bool, optional
+        Print f2py output to screen
+    source_fn : str, optional
+        Name of the file where the fortran source is written.
+        The default is to use a temporary file with the extension
+        provided by the `extension` parameter
+    extension : {'.f', '.f90'}, optional
+        Filename extension if `source_fn` is not provided.
+        The extension tells which fortran standard is used.
+        The default is `.f`, which implies F77 standard.
 
         .. versionadded:: 1.11.0
 
-    '''
+    """
     from numpy.distutils.exec_command import exec_command
     import tempfile
     if source_fn is None:

numpy/testing/utils.py

@@ -1088,18 +1088,13 @@ def rundocs(filename=None, raise_on_error=True):
 
     >>> np.lib.test(doctests=True) #doctest: +SKIP
     """
+    from numpy.compat import npy_load_module
     import doctest
-    import imp
     if filename is None:
         f = sys._getframe(1)
         filename = f.f_globals['__file__']
     name = os.path.splitext(os.path.basename(filename))[0]
-    path = [os.path.dirname(filename)]
-    file, pathname, description = imp.find_module(name, path)
-    try:
-        m = imp.load_module(name, file, pathname, description)
-    finally:
-        file.close()
+    m = npy_load_module(name, filename)
 
     tests = doctest.DocTestFinder().find(m)
     runner = doctest.DocTestRunner(verbose=False)