|
 |
4e2318 |
diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py
|
|
|
4e2318 |
index 5b2329b6d84..53b5d64d453 100644
|
|
|
4e2318 |
--- a/Lib/test/multibytecodec_support.py
|
|
|
4e2318 |
+++ b/Lib/test/multibytecodec_support.py
|
|
|
4e2318 |
@@ -279,30 +279,22 @@ class TestBase_Mapping(unittest.TestCase):
|
|
|
4e2318 |
self._test_mapping_file_plain()
|
|
|
4e2318 |
|
|
|
4e2318 |
def _test_mapping_file_plain(self):
|
|
|
4e2318 |
- _unichr = lambda c: eval("u'\\U%08x'" % int(c, 16))
|
|
|
4e2318 |
- unichrs = lambda s: u''.join(_unichr(c) for c in s.split('+'))
|
|
|
4e2318 |
+ def unichrs(s):
|
|
|
4e2318 |
+ return ''.join(unichr(int(x, 16)) for x in s.split('+'))
|
|
|
4e2318 |
urt_wa = {}
|
|
|
4e2318 |
|
|
|
4e2318 |
with self.open_mapping_file() as f:
|
|
|
4e2318 |
for line in f:
|
|
|
4e2318 |
if not line:
|
|
|
4e2318 |
break
|
|
|
4e2318 |
- data = line.split('#')[0].strip().split()
|
|
|
4e2318 |
+ data = line.split('#')[0].split()
|
|
|
4e2318 |
if len(data) != 2:
|
|
|
4e2318 |
continue
|
|
|
4e2318 |
|
|
|
4e2318 |
- csetval = eval(data[0])
|
|
|
4e2318 |
- if csetval <= 0x7F:
|
|
|
4e2318 |
- csetch = chr(csetval & 0xff)
|
|
|
4e2318 |
- elif csetval >= 0x1000000:
|
|
|
4e2318 |
- csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \
|
|
|
4e2318 |
- chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
|
|
|
4e2318 |
- elif csetval >= 0x10000:
|
|
|
4e2318 |
- csetch = chr(csetval >> 16) + \
|
|
|
4e2318 |
- chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
|
|
|
4e2318 |
- elif csetval >= 0x100:
|
|
|
4e2318 |
- csetch = chr(csetval >> 8) + chr(csetval & 0xff)
|
|
|
4e2318 |
- else:
|
|
|
4e2318 |
+ if data[0][:2] != '0x':
|
|
|
4e2318 |
+ self.fail("Invalid line: {!r}".format(line))
|
|
|
4e2318 |
+ csetch = bytes.fromhex(data[0][2:])
|
|
|
4e2318 |
+ if len(csetch) == 1 and 0x80 <= csetch[0]:
|
|
|
4e2318 |
continue
|
|
|
4e2318 |
|
|
|
4e2318 |
unich = unichrs(data[1])
|