diff options
author | doko <doko@ubuntu.com> | 2017-02-01 13:02:16 +0100 |
---|---|---|
committer | doko <doko@ubuntu.com> | 2017-02-01 13:02:16 +0100 |
commit | 2e835c97b60f5f554ea4742abc1c0f801567f1b9 (patch) | |
tree | e57b9697de6321a39541c2e947940e275ca844d3 /Python/pylifecycle.c | |
parent | ba5a055a00d91a449a23ae14dd468e9b769a6b74 (diff) | |
parent | 75a56cd1847142d9c893b6df5fb674f54b34d9ed (diff) | |
download | cpython-2e835c97b60f5f554ea4742abc1c0f801567f1b9.tar.gz |
Merge 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); |