mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Oops, revert unwanted _testcapi changes of r85174

Browse source
This commit is contained in:
Victor Stinner 2010-10-02 11:46:20 +00:00
parent 749261e241
commit ea3f305a25
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_unicode.py
View file

@ -1396,26 +1396,26 @@ class UnicodeTest(string_tests.CommonTest,
# Test PyUnicode_AsWideChar()
def test_aswidechar(self):
from _testcapi import unicode_aswidechar
from _testcapi import test_aswidechar
from ctypes import c_wchar, sizeof
wchar, size = unicode_aswidechar('abcdef', 2)
wchar, size = test_aswidechar('abcdef', 2)
self.assertEquals(size, 2)
self.assertEquals(wchar, 'ab')
wchar, size = unicode_aswidechar('abc', 3)
wchar, size = test_aswidechar('abc', 3)
self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc')
wchar, size = unicode_aswidechar('abc', 4)
wchar, size = test_aswidechar('abc', 4)
self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0')
wchar, size = unicode_aswidechar('abc', 10)
wchar, size = test_aswidechar('abc', 10)
self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0')
wchar, size = unicode_aswidechar('abc\0def', 20)
wchar, size = test_aswidechar('abc\0def', 20)
self.assertEquals(size, 7)
self.assertEquals(wchar, 'abc\0def\0')
@ -1426,20 +1426,20 @@ class UnicodeTest(string_tests.CommonTest,
else: # sizeof(c_wchar) == 4
buflen = 2
nchar = 1
wchar, size = unicode_aswidechar(nonbmp, buflen)
wchar, size = test_aswidechar(nonbmp, buflen)
self.assertEquals(size, nchar)
self.assertEquals(wchar, nonbmp + '\0')
# Test PyUnicode_AsWideCharString()
def test_aswidecharstring(self):
from _testcapi import unicode_aswidecharstring
from _testcapi import test_aswidecharstring
from ctypes import c_wchar, sizeof
wchar, size = unicode_aswidecharstring('abc')
wchar, size = test_aswidecharstring('abc')
self.assertEquals(size, 3)
self.assertEquals(wchar, 'abc\0')
wchar, size = unicode_aswidecharstring('abc\0def')
wchar, size = test_aswidecharstring('abc\0def')
self.assertEquals(size, 7)
self.assertEquals(wchar, 'abc\0def\0')
@ -1448,7 +1448,7 @@ class UnicodeTest(string_tests.CommonTest,
nchar = 2
else: # sizeof(c_wchar) == 4
nchar = 1
wchar, size = unicode_aswidecharstring(nonbmp)
wchar, size = test_aswidecharstring(nonbmp)
self.assertEquals(size, nchar)
self.assertEquals(wchar, nonbmp + '\0')