summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-01-15 12:43:21 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-01-15 12:43:21 (GMT)
commit4fb8caee87fea1707f9a754365d5ec30c9220f6f (patch)
treec2242f4c4edc984b0d6affe182576d8f8e53efcc /Lib/test
parentad1d5f908a51e1c6fd487e31d6f6aab98bae5c00 (diff)
downloadcpython-4fb8caee87fea1707f9a754365d5ec30c9220f6f.zip
cpython-4fb8caee87fea1707f9a754365d5ec30c9220f6f.tar.gz
cpython-4fb8caee87fea1707f9a754365d5ec30c9220f6f.tar.bz2
Issue #14850: Now a chamap decoder treates U+FFFE as "undefined mapping"
in any mapping, not only in an unicode string.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_codecs.py46
1 files changed, 46 insertions, 0 deletions
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index acf9f64..1fa9ee0 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -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,6 +1729,11 @@ 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}),
@@ -1707,11 +1741,23 @@ class CharmapTest(unittest.TestCase):
)
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):