diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
| commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
| tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Python/pylifecycle.c | |
| parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
| parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
| download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz | |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index a4f7f823bc..06030c330a 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -193,7 +193,8 @@ add_flag(int flag, const char *envs) static char* get_codec_name(const char *encoding) { - char *name_utf8, *name_str; + const char *name_utf8; + char *name_str; PyObject *codec, *name = NULL; codec = _PyCodec_Lookup(encoding); @@ -1284,8 +1285,7 @@ initstdio(void) when import.c tries to write to stderr in verbose mode. */ encoding_attr = PyObject_GetAttrString(std, "encoding"); if (encoding_attr != NULL) { - const char * std_encoding; - std_encoding = PyUnicode_AsUTF8(encoding_attr); + const char *std_encoding = PyUnicode_AsUTF8(encoding_attr); if (std_encoding != NULL) { PyObject *codec_info = _PyCodec_Lookup(std_encoding); Py_XDECREF(codec_info); |