Merged revisions 71847 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71847 | thomas.heller | 2009-04-24 22:00:41 +0200 (Fr, 24 Apr 2009) | 2 lines
Issue 5041: ctypes unwilling to allow pickling wide character.
........
diff --git a/Lib/ctypes/test/test_pickling.py b/Lib/ctypes/test/test_pickling.py
index c7925c7..28868f4 100644
--- a/Lib/ctypes/test/test_pickling.py
+++ b/Lib/ctypes/test/test_pickling.py
@@ -66,6 +66,11 @@
]:
self.assertRaises(ValueError, lambda: self.dumps(item))
+ def test_wchar(self):
+ pickle.dumps(c_char("x"))
+ # Issue 5049
+ pickle.dumps(c_wchar(u"x"))
+
class PickleTest_1(PickleTest):
def dumps(self, item):
return pickle.dumps(item, 1)
diff --git a/Misc/NEWS b/Misc/NEWS
index e1f2630..546c7c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,9 +17,11 @@
- Issue #5759: float() didn't call __float__ on str subclasses.
-Librar
+Library
-------
+- Issue #5041: ctypes does now allow pickling wide character.
+
- Issue #5768: Fixed bug in Unicode output logic and test case for same.
- Issue #1161031: fix readwrite select flag handling: POLLPRI now
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 43da209..7caef29 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1952,7 +1952,7 @@
ml = &c_void_p_method;
stgdict->flags |= TYPEFLAG_ISPOINTER;
break;
- case 'u':
+ case 's':
case 'X':
case 'O':
ml = NULL;