[Python-checkins] cpython (merge 3.4 -> default): Issue #23338: Fixed formatting ctypes error messages on Cygwin.

Sat Apr 4 09:07:43 CEST 2015

https://hg.python.org/cpython/rev/3eb3a6d45251
changeset: 95431:3eb3a6d45251
parent: 95428:e6654af0fc93
parent: 95430:36eca0b259e2
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Apr 04 10:06:58 2015 +0300
summary:
 Issue #23338: Fixed formatting ctypes error messages on Cygwin.
Patch by Makoto Kato.
files:
 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -703,6 +703,7 @@
 Per Øyvind Karlsen
 Anton Kasyanov
 Lou Kates
+Makoto Kato
 Hiroaki Kawai
 Brian Kearns
 Sebastien Keim
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,9 @@
 Library
 -------
 
+- Issue #23338: Fixed formatting ctypes error messages on Cygwin.
+ Patch by Makoto Kato.
+
 - Issue #15582: inspect.getdoc() now follows inheritance chains.
 
 - Issue #2175: SAX parsers now support a character stream of InputSource object.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -593,7 +593,7 @@
 #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());
@@ -3280,7 +3280,7 @@
 #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());
-- 
Repository URL: https://hg.python.org/cpython
