greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-140041: Fix import of ctypes on Android and Cygwin when ABI flags are present (#140178)

Browse Source 
Use sysconfig to determine the full name of libpython, rather than hardcoding
a library name that doesn't have ABI flags.
This commit is contained in:
Malcolm Smith
2025-10-15 22:40:39 +01:00
committed by GitHub
parent 65d1a14d59
commit 7f371ed84b
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Android/testbed/app/build.gradle.kts
View File

@@ -47,7 +47,7 @@ for ((i, prefix) in prefixes.withIndex()) {
val libDir = file("$prefix/lib") val libDir = file("$prefix/lib")
val version = run { val version = run {
for (filename in libDir.list()!!) { for (filename in libDir.list()!!) {
"""python(\d+\.\d+)""".toRegex().matchEntire(filename)?.let { """python(\d+\.\d+[a-z]*)""".toRegex().matchEntire(filename)?.let {
return@run it.groupValues[1] return@run it.groupValues[1]
} }
} }
@@ -64,9 +64,10 @@ for ((i, prefix) in prefixes.withIndex()) {
val libPythonDir = file("$libDir/python$pythonVersion") val libPythonDir = file("$libDir/python$pythonVersion")
val triplet = run { val triplet = run {
for (filename in libPythonDir.list()!!) { for (filename in libPythonDir.list()!!) {
"""_sysconfigdata__android_(.+).py""".toRegex().matchEntire(filename)?.let { """_sysconfigdata_[a-z]*_android_(.+).py""".toRegex()
return@run it.groupValues[1] .matchEntire(filename)?.let {
} return@run it.groupValues[1]
}
} }
throw GradleException("Failed to find Python triplet in $libPythonDir") throw GradleException("Failed to find Python triplet in $libPythonDir")
} }

11
Lib/ctypes/__init__.py
View File

@@ -1,6 +1,8 @@
"""create and manipulate C data types in Python""" """create and manipulate C data types in Python"""
import os as _os, sys as _sys import os as _os
import sys as _sys
import sysconfig as _sysconfig
import types as _types import types as _types
__version__ = "1.1.0" __version__ = "1.1.0"
@@ -550,10 +552,9 @@ pydll = LibraryLoader(PyDLL)
if _os.name == "nt": if _os.name == "nt":
pythonapi = PyDLL("python dll", None, _sys.dllhandle) pythonapi = PyDLL("python dll", None, _sys.dllhandle)
elif _sys.platform == "android": elif _sys.platform in ["android", "cygwin"]:
pythonapi = PyDLL("libpython%d.%d.so" % _sys.version_info[:2]) # These are Unix-like platforms which use a dynamically-linked libpython.
elif _sys.platform == "cygwin": pythonapi = PyDLL(_sysconfig.get_config_var("LDLIBRARY"))
pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
else: else:
pythonapi = PyDLL(None) pythonapi = PyDLL(None)

1
Misc/NEWS.d/next/Library/2025-10-15-21-42-13.gh-issue-140041._Fka2j.rst Normal file
View File

@@ -0,0 +1 @@
Fix import of :mod:`ctypes` on Android and Cygwin when ABI flags are present.