Merge branches 'sort-filter-walk-packages' and 'sage-getfile-2' into meson-try-editable

Author: user202729

src/sage/misc/package_dir.py

@@ -402,9 +402,9 @@ def iter_modules(path=None, prefix=''):
                     yielded[name] = 1
                     yield ModuleInfo(i, name, ispkg)
 
-    def iter_importer_modules(importer, prefix=''):
+    def _iter_importer_modules_helper(importer, prefix=''):
         r"""
-        Yield :class:`ModuleInfo` for all modules of ``importer``.
+        Helper function for :func:`iter_importer_modules`.
         """
         from importlib.machinery import FileFinder
 
@@ -423,11 +423,6 @@ def iter_importer_modules(importer, prefix=''):
 
             for fn in filenames:
                 modname = inspect.getmodulename(fn)
-                if modname and (modname in ['__init__', 'all']
-                                or modname.startswith('all__')
-                                or modname in yielded):
-                    continue
-
                 path = os.path.join(importer.path, fn)
                 ispkg = False
 
@@ -446,6 +441,18 @@ def iter_importer_modules(importer, prefix=''):
         else:
             yield from importer.iter_modules(prefix)
 
+    def iter_importer_modules(importer, prefix=''):
+        r"""
+        Yield :class:`ModuleInfo` for all modules of ``importer``.
+        """
+        for name, ispkg in sorted(list(_iter_importer_modules_helper(importer, prefix))):
+            # we sort again for consistency of output ordering if importer is not
+            # a FileFinder (needed in doctest of :func:`sage.misc.dev_tools/load_submodules`)
+            modname = name.rsplit('.', 1)[-1]
+            if modname in ['__init__', 'all'] or modname.startswith('all__'):
+                continue
+            yield name, ispkg
+
     def seen(p, m={}):
         if p in m:
             return True

src/sage/misc/sageinspect.py

@@ -1328,6 +1328,16 @@ def sage_getfile(obj):
         if isinstance(obj, functools.partial):
             return sage_getfile(obj.func)
         return sage_getfile(obj.__class__)  # inspect.getabsfile(obj.__class__)
+    else:
+        try:
+            objinit = obj.__init__
+        except AttributeError:
+            pass
+        else:
+            pos = _extract_embedded_position(_sage_getdoc_unformatted(objinit))
+            if pos is not None:
+                (_, filename, _) = pos
+                return filename
 
     # No go? fall back to inspect.
     try:
@@ -1336,6 +1346,10 @@ def sage_getfile(obj):
         return ''
     for suffix in import_machinery.EXTENSION_SUFFIXES:
         if sourcefile.endswith(suffix):
+            # TODO: the following is incorrect in meson editable install
+            # but as long as either the class or its __init__ method has a
+            # docstring, _sage_getdoc_unformatted should return correct result
+            # see https://github.com/mesonbuild/meson-python/issues/723
             return sourcefile.removesuffix(suffix)+os.path.extsep+'pyx'
     return sourcefile