From 061b14a4a1f64532bfb4d716849ae662c09da62a Mon Sep 17 00:00:00 2001 From: Daniel Stutzbach Date: Tue, 31 Aug 2010 15:45:04 +0000 Subject: Reverted r84315 and r84316, with Benjamin's blessing. The tests were fine. They were failing due to a problem exposed in r84307 and fixed in r84317. See Issue 8781 for details. --- Lib/ctypes/test/test_parameters.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py index 75ec476..e83fd9a 100644 --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -67,20 +67,19 @@ class SimpleTypesTestCase(unittest.TestCase): self.assertTrue(c_char_p.from_param(a) is a) def test_cw_strings(self): - from ctypes import byref, sizeof + from ctypes import byref try: - from ctypes import c_wchar, c_wchar_p + from ctypes import c_wchar_p except ImportError: ## print "(No c_wchar_p)" return s = "123" if sys.platform == "win32": - unisize = 8 if sys.maxunicode == 1114111 else 4 - if unisize == sizeof(c_wchar): - self.assertIs(c_wchar_p.from_param(s)._obj, s) - # new in 0.9.1: convert (decode) ascii to unicode - self.assertEqual(c_wchar_p.from_param("123")._obj, "123") + self.assertTrue(c_wchar_p.from_param(s)._obj is s) self.assertRaises(TypeError, c_wchar_p.from_param, 42) + + # new in 0.9.1: convert (decode) ascii to unicode + self.assertEqual(c_wchar_p.from_param("123")._obj, "123") self.assertRaises(TypeError, c_wchar_p.from_param, b"123\377") pa = c_wchar_p.from_param(c_wchar_p("123")) -- cgit v0.12