[Python-checkins] r71851 - in python/branches/release26-maint: Lib/ctypes/test/test_pickling.py Misc/NEWS Modules/_ctypes/_ctypes.c

[thomas.heller]

Author: thomas.heller
Date: Fri Apr 24 22:18:22 2009
New Revision: 71851

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/ctypes/test/test_pickling.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_ctypes/_ctypes.c

Modified: python/branches/release26-maint/Lib/ctypes/test/test_pickling.py
==============================================================================
--- python/branches/release26-maint/Lib/ctypes/test/test_pickling.py	(original)
+++ python/branches/release26-maint/Lib/ctypes/test/test_pickling.py	Fri Apr 24 22:18:22 2009
@@ -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)

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Apr 24 22:18:22 2009
@@ -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

Modified: python/branches/release26-maint/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/_ctypes.c	(original)
+++ python/branches/release26-maint/Modules/_ctypes/_ctypes.c	Fri Apr 24 22:18:22 2009
@@ -1952,7 +1952,7 @@
 			ml = &c_void_p_method;
 			stgdict->flags |= TYPEFLAG_ISPOINTER;
 			break;
-		case 'u':
+		case 's':
 		case 'X':
 		case 'O':
 			ml = NULL;