merge 3.2

1 files changed, 7 insertions, 8 deletions

diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index 2606e1e32f..a914a0846e 100644
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -10,17 +10,16 @@
 extern char *Py_GetProgramName(void);
 
 const struct filedescr _PyImport_DynLoadFiletab[] = {
-	{".o", "rb", C_EXTENSION},
-	{"module.o", "rb", C_EXTENSION},
-	{0, 0}
+    {".o", "rb", C_EXTENSION},
+    {0, 0}
 };
 
 
-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);
 }