(original) (raw)

changeset: 103554:3b185df3a3e2 user: Victor Stinner victor.stinner@gmail.com date: Fri Sep 09 23:11:52 2016 -0700 files: Python/fileutils.c description: Fix check_force_ascii() Issue #27938: Normalize aliases of the ASCII encoding, because _Py_normalize_encoding() now correctly normalize encoding names. diff -r 09c730db1aac -r 3b185df3a3e2 Python/fileutils.c --- a/Python/fileutils.c Fri Sep 09 22:56:54 2016 -0700 +++ b/Python/fileutils.c Fri Sep 09 23:11:52 2016 -0700 @@ -104,23 +104,24 @@ 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 /victor.stinner@gmail.com