mirror of
https://github.com/python/cpython.git
synced 2025-08-28 04:35:02 +00:00
Issue #14850: Now a chamap decoder treates U+FFFE as "undefined mapping"
in any mapping, not only in an unicode string.
This commit is contained in:
parent
ad1d5f908a
commit
4fb8caee87
3 changed files with 74 additions and 21 deletions
|
@ -1586,6 +1586,10 @@ class CharmapTest(unittest.TestCase):
|
|||
codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab"
|
||||
)
|
||||
|
||||
self.assertRaises(UnicodeDecodeError,
|
||||
codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab\ufffe"
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "replace", "ab"),
|
||||
("ab\ufffd", 3)
|
||||
|
@ -1642,6 +1646,17 @@ class CharmapTest(unittest.TestCase):
|
|||
{0: 'a', 1: 'b'}
|
||||
)
|
||||
|
||||
self.assertRaises(UnicodeDecodeError,
|
||||
codecs.charmap_decode, b"\x00\x01\x02", "strict",
|
||||
{0: 'a', 1: 'b', 2: None}
|
||||
)
|
||||
|
||||
# Issue #14850
|
||||
self.assertRaises(UnicodeDecodeError,
|
||||
codecs.charmap_decode, b"\x00\x01\x02", "strict",
|
||||
{0: 'a', 1: 'b', 2: '\ufffe'}
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "replace",
|
||||
{0: 'a', 1: 'b'}),
|
||||
|
@ -1654,6 +1669,13 @@ class CharmapTest(unittest.TestCase):
|
|||
("ab\ufffd", 3)
|
||||
)
|
||||
|
||||
# Issue #14850
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "replace",
|
||||
{0: 'a', 1: 'b', 2: '\ufffe'}),
|
||||
("ab\ufffd", 3)
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "ignore",
|
||||
{0: 'a', 1: 'b'}),
|
||||
|
@ -1666,6 +1688,13 @@ class CharmapTest(unittest.TestCase):
|
|||
("ab", 3)
|
||||
)
|
||||
|
||||
# Issue #14850
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "ignore",
|
||||
{0: 'a', 1: 'b', 2: '\ufffe'}),
|
||||
("ab", 3)
|
||||
)
|
||||
|
||||
allbytes = bytes(range(256))
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(allbytes, "ignore", {}),
|
||||
|
@ -1700,18 +1729,35 @@ class CharmapTest(unittest.TestCase):
|
|||
{0: a, 1: b},
|
||||
)
|
||||
|
||||
self.assertRaises(UnicodeDecodeError,
|
||||
codecs.charmap_decode, b"\x00\x01\x02", "strict",
|
||||
{0: a, 1: b, 2: 0xFFFE},
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "replace",
|
||||
{0: a, 1: b}),
|
||||
("ab\ufffd", 3)
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "replace",
|
||||
{0: a, 1: b, 2: 0xFFFE}),
|
||||
("ab\ufffd", 3)
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "ignore",
|
||||
{0: a, 1: b}),
|
||||
("ab", 3)
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
codecs.charmap_decode(b"\x00\x01\x02", "ignore",
|
||||
{0: a, 1: b, 2: 0xFFFE}),
|
||||
("ab", 3)
|
||||
)
|
||||
|
||||
|
||||
class WithStmtTest(unittest.TestCase):
|
||||
def test_encodedfile(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue