diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-02 11:46:20 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-02 11:46:20 (GMT) |
commit | ea3f305a25fc9a1f5824b0a0ad4ea3f17c896b21 (patch) | |
tree | 2aaa6d9048836d869d538db66c5fd78ca4c42f6b /Lib | |
parent | 749261e241849834a5cfc70808260a534e50875f (diff) | |
download | cpython-ea3f305a25fc9a1f5824b0a0ad4ea3f17c896b21.zip cpython-ea3f305a25fc9a1f5824b0a0ad4ea3f17c896b21.tar.gz cpython-ea3f305a25fc9a1f5824b0a0ad4ea3f17c896b21.tar.bz2 |
Oops, revert unwanted _testcapi changes of r85174
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_unicode.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index ff90745..285b7af 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -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') |