mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Merged revisions 72283-72284 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72283 | antoine.pitrou | 2009-05-04 20:32:32 +0200 (lun., 04 mai 2009) | 4 lines Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences. Patch by Nick Barnes and Victor Stinner. ........ r72284 | antoine.pitrou | 2009-05-04 20:32:50 +0200 (lun., 04 mai 2009) | 3 lines Add Nick Barnes to ACKS. ........
This commit is contained in:
parent
375c019738
commit
244651aa2f
5 changed files with 272 additions and 195 deletions
|
@ -867,19 +867,31 @@ class UnicodeTest(
|
|||
('+?', b'+-?'),
|
||||
(r'\\?', b'+AFwAXA?'),
|
||||
(r'\\\?', b'+AFwAXABc?'),
|
||||
(r'++--', b'+-+---')
|
||||
(r'++--', b'+-+---'),
|
||||
('\U000abcde', b'+2m/c3g-'), # surrogate pairs
|
||||
('/', b'/'),
|
||||
]
|
||||
|
||||
for (x, y) in utfTests:
|
||||
self.assertEqual(x.encode('utf-7'), y)
|
||||
|
||||
# surrogates not supported
|
||||
# Unpaired surrogates not supported
|
||||
self.assertRaises(UnicodeError, str, b'+3ADYAA-', 'utf-7')
|
||||
|
||||
self.assertEqual(str(b'+3ADYAA-', 'utf-7', 'replace'), '\ufffd')
|
||||
self.assertEqual(str(b'+3ADYAA-', 'utf-7', 'replace'), '\ufffd\ufffd')
|
||||
|
||||
# Issue #2242: crash on some Windows/MSVC versions
|
||||
self.assertRaises(UnicodeDecodeError, b'+\xc1'.decode, 'utf-7')
|
||||
self.assertEqual(b'+\xc1'.decode('utf-7'), '\xc1')
|
||||
|
||||
# Direct encoded characters
|
||||
set_d = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'(),-./:?"
|
||||
# Optional direct characters
|
||||
set_o = '!"#$%&*;<=>@[]^_`{|}'
|
||||
for c in set_d:
|
||||
self.assertEqual(c.encode('utf7'), c.encode('ascii'))
|
||||
self.assertEqual(c.encode('ascii').decode('utf7'), c)
|
||||
for c in set_o:
|
||||
self.assertEqual(c.encode('ascii').decode('utf7'), c)
|
||||
|
||||
def test_codecs_utf8(self):
|
||||
self.assertEqual(''.encode('utf-8'), b'')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue