Rename the surrogates error handler to surrogatepass.
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 79b1fab..9ca7699 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -545,12 +545,12 @@
self.assertRaises(UnicodeEncodeError, "\ud800".encode, "utf-8")
self.assertRaises(UnicodeDecodeError, b"\xed\xa0\x80".decode, "utf-8")
- def test_surrogates_handler(self):
- self.assertEquals("abc\ud800def".encode("utf-8", "surrogates"),
+ def test_surrogatepass_handler(self):
+ self.assertEquals("abc\ud800def".encode("utf-8", "surrogatepass"),
b"abc\xed\xa0\x80def")
- self.assertEquals(b"abc\xed\xa0\x80def".decode("utf-8", "surrogates"),
+ self.assertEquals(b"abc\xed\xa0\x80def".decode("utf-8", "surrogatepass"),
"abc\ud800def")
- self.assertTrue(codecs.lookup_error("surrogates"))
+ self.assertTrue(codecs.lookup_error("surrogatepass"))
class UTF7Test(ReadTest):
encoding = "utf-7"
@@ -1040,12 +1040,12 @@
# Skipped
continue
# The Unicode strings are given in UTF-8
- orig = str(orig, "utf-8", "surrogates")
+ orig = str(orig, "utf-8", "surrogatepass")
if prepped is None:
# Input contains prohibited characters
self.assertRaises(UnicodeError, nameprep, orig)
else:
- prepped = str(prepped, "utf-8", "surrogates")
+ prepped = str(prepped, "utf-8", "surrogatepass")
try:
self.assertEquals(nameprep(orig), prepped)
except Exception as e: