mirror of
https://github.com/python/cpython.git
synced 2025-09-19 15:10:58 +00:00
Fix text failures when ctypes is not available
(followup to Victor's 85d11cf67aa8 and 7a50e549bd11)
This commit is contained in:
parent
4637309ee6
commit
00b2c86d09
2 changed files with 39 additions and 28 deletions
|
@ -1,8 +1,13 @@
|
||||||
import test.support, unittest
|
import test.support, unittest
|
||||||
import sys, codecs, html.entities, unicodedata
|
import sys, codecs, html.entities, unicodedata
|
||||||
import ctypes
|
|
||||||
|
|
||||||
SIZEOF_WCHAR_T = ctypes.sizeof(ctypes.c_wchar)
|
try:
|
||||||
|
import ctypes
|
||||||
|
except ImportError:
|
||||||
|
ctypes = None
|
||||||
|
SIZEOF_WCHAR_T = -1
|
||||||
|
else:
|
||||||
|
SIZEOF_WCHAR_T = ctypes.sizeof(ctypes.c_wchar)
|
||||||
|
|
||||||
class PosReturn:
|
class PosReturn:
|
||||||
# this can be used for configurable callbacks
|
# this can be used for configurable callbacks
|
||||||
|
@ -572,10 +577,11 @@ class CodecCallbackTest(unittest.TestCase):
|
||||||
UnicodeEncodeError("ascii", "\uffff", 0, 1, "ouch")),
|
UnicodeEncodeError("ascii", "\uffff", 0, 1, "ouch")),
|
||||||
("\\uffff", 1)
|
("\\uffff", 1)
|
||||||
)
|
)
|
||||||
if ctypes.sizeof(ctypes.c_wchar) == 2:
|
if SIZEOF_WCHAR_T == 2:
|
||||||
len_wide = 2
|
len_wide = 2
|
||||||
else:
|
else:
|
||||||
len_wide = 1
|
len_wide = 1
|
||||||
|
if SIZEOF_WCHAR_T > 0:
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
codecs.backslashreplace_errors(
|
codecs.backslashreplace_errors(
|
||||||
UnicodeEncodeError("ascii", "\U00010000",
|
UnicodeEncodeError("ascii", "\U00010000",
|
||||||
|
|
|
@ -3,9 +3,14 @@ import unittest
|
||||||
import codecs
|
import codecs
|
||||||
import locale
|
import locale
|
||||||
import sys, _testcapi, io
|
import sys, _testcapi, io
|
||||||
import ctypes
|
|
||||||
|
|
||||||
SIZEOF_WCHAR_T = ctypes.sizeof(ctypes.c_wchar)
|
try:
|
||||||
|
import ctypes
|
||||||
|
except ImportError:
|
||||||
|
ctypes = None
|
||||||
|
SIZEOF_WCHAR_T = -1
|
||||||
|
else:
|
||||||
|
SIZEOF_WCHAR_T = ctypes.sizeof(ctypes.c_wchar)
|
||||||
|
|
||||||
class Queue(object):
|
class Queue(object):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue