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.
........

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("x"))
+        # Issue 5049
+        pickle.dumps(c_wchar(u"x"))
+
 class PickleTest_1(PickleTest):
     def dumps(self, item):
         return pickle.dumps(item, 1)

Misc/NEWS

@@ -17,9 +17,11 @@ Core and Builtins
 
 - 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

Modules/_ctypes/_ctypes.c

@@ -1952,7 +1952,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;