From 0d4e01ca0747dd3d6484403acb7a1728b0c8652e Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 16 May 2014 14:46:20 +0200
Subject: Issue #13916: Fix surrogatepass error handler on Windows

---
 Lib/test/test_codecs.py | 6 ------
 Python/codecs.c         | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index e4d7a60..f59c37d 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -2841,12 +2841,6 @@ class CodePageTest(unittest.TestCase):
             (b'abc', 'strict', 'abc'),
             (b'\xe9\x80', 'strict', '\xe9\u20ac'),
             (b'\xff', 'strict', '\xff'),
-            # invalid bytes
-            (b'[\x98]', 'strict', None),
-            (b'[\x98]', 'ignore', '[]'),
-            (b'[\x98]', 'replace', '[\ufffd]'),
-            (b'[\x98]', 'surrogateescape', '[\udc98]'),
-            (b'[\x98]', 'surrogatepass', None),
         ))
 
     def test_cp_utf7(self):
diff --git a/Python/codecs.c b/Python/codecs.c
index 7003136..4c2ae38 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -960,6 +960,10 @@ get_standard_encoding(const char *encoding, int *bytelength)
             }
         }
     }
+    else if (strcmp(encoding, "CP_UTF8") == 0) {
+        *bytelength = 3;
+        return ENC_UTF8;
+    }
     return ENC_UNKNOWN;
 }
 
-- 
cgit v0.12