Merge issue #16373: Prevent infinite recursion for ABC Set class operations.

Patch by Serhiy Storchaka.

1 files changed, 6 insertions, 10 deletions

diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index 2606e1e32f..5836cb3b29 100644
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -9,18 +9,14 @@
 
 extern char *Py_GetProgramName(void);
 
-const struct filedescr _PyImport_DynLoadFiletab[] = {
-	{".o", "rb", C_EXTENSION},
-	{"module.o", "rb", C_EXTENSION},
-	{0, 0}
-};
+const char *_PyImport_DynLoadFiletab[] = {".o", NULL};
 
 
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
-				    const char *pathname, FILE *fp)
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
+                                    const char *pathname, FILE *fp)
 {
-	char funcname[258];
+    char funcname[258];
 
-	PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
-	return dl_loadmod(Py_GetProgramName(), pathname, funcname);
+    PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
+    return dl_loadmod(Py_GetProgramName(), pathname, funcname);
 }