From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 5 Aug 2016 16:37:25 +0000 (+0200)
Subject: python plugin: review fixes
X-Git-Tag: collectd-5.6.0~105^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5b4053d27b6a24e2f18e678f0d8c3343b7dfad7c;p=collectd.git

python plugin: review fixes
---

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) {