Issue #13916: Fix surrogatepass error handler on Windows

vstinner · vstinner · commit 0d4e01ca0747 · 2014-05-16T14:46:20.000+02:00
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -2841,12 +2841,6 @@ def test_cp1252(self):
             (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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -960,6 +960,10 @@ get_standard_encoding(const char encoding, int bytelength)`
`960`	`960`	`}`
`961`	`961`	`}`
`962`	`962`	`}`
	`963`	`+ else if (strcmp(encoding, "CP_UTF8") == 0) {`
	`964`	`+ *bytelength = 3;`
	`965`	`+ return ENC_UTF8;`
	`966`	`+ }`
`963`	`967`	`return ENC_UNKNOWN;`
`964`	`968`	`}`
`965`	`969`