diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-09-09 23:11:52 -0700 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-09-09 23:11:52 -0700 |
| commit | 087ceac9f7760db89fa2418ff41e3791322f55f0 (patch) | |
| tree | b59b75f9bda63a249a7c4813a29603cfb1125cb3 | |
| parent | 7223c72a329aeac30466409f9453cb676abcffdf (diff) | |
| download | cpython-087ceac9f7760db89fa2418ff41e3791322f55f0.tar.gz | |
Fix check_force_ascii()
Issue #27938: Normalize aliases of the ASCII encoding, because
_Py_normalize_encoding() now correctly normalize encoding names.
| -rw-r--r-- | Python/fileutils.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 7ce3b63306..e3bfb0c502 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -104,23 +104,24 @@ check_force_ascii(void) char *loc; #if defined(HAVE_LANGINFO_H) && defined(CODESET) char *codeset, **alias; - char encoding[100]; + char encoding[20]; /* longest name: "iso_646.irv_1991\0" */ int is_ascii; unsigned int i; char* ascii_aliases[] = { "ascii", + /* Aliases from Lib/encodings/aliases.py */ "646", - "ansi-x3.4-1968", - "ansi-x3-4-1968", - "ansi-x3.4-1986", + "ansi_x3.4_1968", + "ansi_x3.4_1986", + "ansi_x3_4_1968", "cp367", "csascii", "ibm367", - "iso646-us", - "iso-646.irv-1991", - "iso-ir-6", + "iso646_us", + "iso_646.irv_1991", + "iso_ir_6", "us", - "us-ascii", + "us_ascii", NULL }; #endif |