Issue #23338: Fixed formatting ctypes error messages on Cygwin.

Patch by Makoto Kato.

diff --git a/Misc/ACKS b/Misc/ACKS
index a3455b65807ba7aaee6decdf2e6586d47c0cc320..af84d0993b12f45698613920fb38f933dd537964 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -685,6 +685,7 @@ Janne Karila
 Per Øyvind Karlsen
 Anton Kasyanov
 Lou Kates
+Makoto Kato
 Hiroaki Kawai
 Brian Kearns
 Sebastien Keim

diff --git a/Misc/NEWS b/Misc/NEWS
index 514c2dadbcb13dc6fee72b8a08ab37eef12e5719..783bf8821c054511e3399e15d898d291007a4f52 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #23338: Fixed formatting ctypes error messages on Cygwin.
+  Patch by Makoto Kato.
+
 - Issue #16840: Tkinter now supports 64-bit integers added in Tcl 8.4 and
   arbitrary precision integers added in Tcl 8.5.
 

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 555600d4fc5c1e26fbed73775f657bc4c098204d..96ffa9d9a82cf651c95f03d19b806fc2d543b1e7 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -642,7 +642,7 @@ CDataType_in_dll(PyObject *type, PyObject *args)
 #ifdef __CYGWIN__
 /* dlerror() isn't very helpful on cygwin */
         PyErr_Format(PyExc_ValueError,
-                     "symbol '%s' not found (%s) ",
+                     "symbol '%s' not found",
                      name);
 #else
         PyErr_SetString(PyExc_ValueError, ctypes_dlerror());
@@ -3393,7 +3393,7 @@ PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
 #ifdef __CYGWIN__
 /* dlerror() isn't very helpful on cygwin */
         PyErr_Format(PyExc_AttributeError,
-                     "function '%s' not found (%s) ",
+                     "function '%s' not found",
                      name);
 #else
         PyErr_SetString(PyExc_AttributeError, ctypes_dlerror());