From 2e229e025c5be101fbaaa5ace453fd78e5bffdd1 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 4 Apr 2015 10:05:48 +0300 Subject: Issue #23338: Fixed formatting ctypes error messages on Cygwin. Patch by Makoto Kato. --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/_ctypes/_ctypes.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS index 7796cda..66d340d 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -692,6 +692,7 @@ Janne Karila Per Øyvind Karlsen Anton Kasyanov Lou Kates +Makoto Kato Hiroaki Kawai Sebastien Keim Ryan Kelly diff --git a/Misc/NEWS b/Misc/NEWS index 6730e9f..b6e7889 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,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 14ec4ce..558abe3 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -593,7 +593,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()); @@ -3279,7 +3279,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()); -- cgit v0.12