From 5b4053d27b6a24e2f18e678f0d8c3343b7dfad7c Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 5 Aug 2016 18:37:25 +0200 Subject: [PATCH] python plugin: review fixes --- src/python.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/python.c b/src/python.c index 4d294ddb..deab4be1 100644 --- a/src/python.c +++ b/src/python.c @@ -1124,20 +1124,22 @@ static int cpy_config(oconfig_item_t *ci) { continue; } } else if (strcasecmp(item->key, "Encoding") == 0) { +#ifdef IS_PY3K + ERROR("python: \"Encoding\" was used in the config file but Python3 was used, which does not support changing encodings"); + status = 1; + continue; +#endif char *encoding = NULL; if (cf_util_get_string(item, &encoding) != 0) { status = 1; continue; } -#ifdef IS_PY3K - ERROR("python: \"Encoding\" was used in the config file but Python3 was used, which does not support changing encodings"); - status = 1; -#else /* Why is this even necessary? And undocumented? */ - if (PyUnicode_SetDefaultEncoding(encoding)) + if (PyUnicode_SetDefaultEncoding(encoding)) { cpy_log_exception("setting default encoding"); + status = 1; + } sfree(encoding); -#endif } else if (strcasecmp(item->key, "LogTraces") == 0) { _Bool log_traces; if (cf_util_get_boolean(item, &log_traces) != 0) { -- 2.11.0