cpython: 3b185df3a3e2 (original) (raw)

Mercurial > cpython

changeset 103554:3b185df3a3e2

Fix check_force_ascii() Issue #27938: Normalize aliases of the ASCII encoding, because _Py_normalize_encoding() now correctly normalize encoding names. [#27938]

Victor Stinner victor.stinner@gmail.com
date	Fri, 09 Sep 2016 23:11:52 -0700
parents	09c730db1aac
children	5aa77974dd56
files	Python/fileutils.c
diffstat	1 files changed, 9 insertions(+), 8 deletions(-)[+] [-] Python/fileutils.c 17

line wrap: on

line diff

--- 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 */[](#l1.13)
   "646",[](#l1.14)

```
   "ansi-x3.4-1968",[](#l1.15)
```
```
   "ansi-x3-4-1968",[](#l1.16)
```
```
   "ansi-x3.4-1986",[](#l1.17)
```

```
   "ansi_x3.4_1968",[](#l1.18)
```
```
   "ansi_x3.4_1986",[](#l1.19)
```

   "ansi_x3_4_1968",[](#l1.20)
   "cp367",[](#l1.21)
   "csascii",[](#l1.22)
   "ibm367",[](#l1.23)

```
   "iso646-us",[](#l1.24)
```
```
   "iso-646.irv-1991",[](#l1.25)
```
```
   "iso-ir-6",[](#l1.26)
```

```
   "iso646_us",[](#l1.27)
```
```
   "iso_646.irv_1991",[](#l1.28)
```

   "iso_ir_6",[](#l1.29)
   "us",[](#l1.30)

```
   "us-ascii",[](#l1.31)
```

   "us_ascii",[](#l1.32)
   NULL[](#l1.33)

};

#endif