From: Thomas Heller <theller@ctypes.org>
Date: Fri, 24 Apr 2009 20:05:20 +0000 (+0000)
Subject: Merged revisions 71847 via svnmerge from
X-Git-Tag: v3.1b1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9baac88abf24bdd6a70525567425334c7dc1939;p=python

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 94a14b97bd..d88f08b9f0 100644
--- a/Lib/ctypes/test/test_pickling.py
+++ b/Lib/ctypes/test/test_pickling.py
@@ -66,6 +66,11 @@ class PickleTest(unittest.TestCase):
             ]:
             self.assertRaises(ValueError, lambda: self.dumps(item))
 
+    def test_wchar(self):
+        pickle.dumps(c_char(b"x"))
+        # Issue 5049
+        pickle.dumps(c_wchar("x"))
+
 class PickleTest_1(PickleTest):
     def dumps(self, item):
         return pickle.dumps(item, 1)
diff --git a/Misc/NEWS b/Misc/NEWS
index 1898e17aca..ed1e401f05 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -430,7 +430,7 @@ Core and Builtins
 Library
 -------
 
-- Issue #5795: Fixed test_distutils failure on Debian ppc.
+- Issue #5041: ctypes does now allow pickling wide character.
 
 - Issue #5607: fixed Distutils test_get_platform for Mac OS X fat binaries.
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 69a8c731b0..5fedba3008 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1927,7 +1927,7 @@ SimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 			ml = &c_void_p_method;
 			stgdict->flags |= TYPEFLAG_ISPOINTER;
 			break;
-		case 'u':
+		case 's':
 		case 'X':
 		case 'O':
 			ml = NULL;