This commit fixes the issue gh-127865.

velemas · velemas · commit 419304823f98 · 2024-12-12T19:14:50.000+02:00
diff --git a/Python/import.c b/Python/import.c
@@ -749,7 +749,7 @@ const char *
 _PyImport_ResolveNameWithPackageContext(const char *name)
 {
 #ifndef HAVE_THREAD_LOCAL
-    PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
+    PyMutex_Lock(&EXTENSIONS.mutex);
 #endif
     if (PKGCONTEXT != NULL) {
         const char *p = strrchr(PKGCONTEXT, '.');
@@ -759,7 +759,7 @@ _PyImport_ResolveNameWithPackageContext(const char *name)
         }
     }
 #ifndef HAVE_THREAD_LOCAL
-    PyThread_release_lock(EXTENSIONS.mutex);
+    PyMutex_Unlock(&EXTENSIONS.mutex);
 #endif
     return name;
 }
@@ -768,12 +768,12 @@ const char *
 _PyImport_SwapPackageContext(const char *newcontext)
 {
 #ifndef HAVE_THREAD_LOCAL
-    PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
+    PyMutex_Lock(&EXTENSIONS.mutex);
 #endif
     const char *oldcontext = PKGCONTEXT;
     PKGCONTEXT = newcontext;
 #ifndef HAVE_THREAD_LOCAL
-    PyThread_release_lock(EXTENSIONS.mutex);
+    PyMutex_Unlock(&EXTENSIONS.mutex);
 #endif
     return oldcontext;
 }

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ const char *`
`749`	`749`	`_PyImport_ResolveNameWithPackageContext(const char *name)`
`750`	`750`	`{`
`751`	`751`	`#ifndef HAVE_THREAD_LOCAL`
`752`		`- PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);`
	`752`	`+ PyMutex_Lock(&EXTENSIONS.mutex);`
`753`	`753`	`#endif`
`754`	`754`	`if (PKGCONTEXT != NULL) {`
`755`	`755`	`const char *p = strrchr(PKGCONTEXT, '.');`
`@@ -759,7 +759,7 @@ _PyImport_ResolveNameWithPackageContext(const char *name)`
`759`	`759`	`}`
`760`	`760`	`}`
`761`	`761`	`#ifndef HAVE_THREAD_LOCAL`
`762`		`- PyThread_release_lock(EXTENSIONS.mutex);`
	`762`	`+ PyMutex_Unlock(&EXTENSIONS.mutex);`
`763`	`763`	`#endif`
`764`	`764`	`return name;`
`765`	`765`	`}`
`@ 8000 @ -768,12 +768,12 @@ const char *`
`768`	`768`	`_PyImport_SwapPackageContext(const char *newcontext)`
`769`	`769`	`{`
`770`	`770`	`#ifndef HAVE_THREAD_LOCAL`
`771`		`- PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);`
	`771`	`+ PyMutex_Lock(&EXTENSIONS.mutex);`
`772`	`772`	`#endif`
`773`	`773`	`const char *oldcontext = PKGCONTEXT;`
`774`	`774`	`PKGCONTEXT = newcontext;`
`775`	`775`	`#ifndef HAVE_THREAD_LOCAL`
`776`		`- PyThread_release_lock(EXTENSIONS.mutex);`
	`776`	`+ PyMutex_Unlock(&EXTENSIONS.mutex);`
`777`	`777`	`#endif`
`778`	`778`	`return oldcontext;`
`779`	`779`	`}`