Merged with the 1.29 branch.

1 files changed, 26 insertions, 10 deletions

diff --git a/src/python/nxt_python.c b/src/python/nxt_python.c
index bdb04579..7c059649 100644
--- a/src/python/nxt_python.c
+++ b/src/python/nxt_python.c
@@ -75,8 +75,25 @@ static nxt_python_proto_t    nxt_py_proto;
 static nxt_int_t
 nxt_python3_init_config(nxt_int_t pep405)
 {
-    PyStatus  status;
-    PyConfig  config;
+    PyConfig     config;
+    PyStatus     status;
+    nxt_int_t    ret;
+    PyPreConfig  preconfig;
+
+    ret = NXT_ERROR;
+
+    PyPreConfig_InitIsolatedConfig(&preconfig);
+    /*
+     * Determine whether to use UTF-8 mode or not, UTF-8
+     * will be enabled if LC_CTYPE is C, POSIX or some
+     * specific UTF-8 locale.
+     */
+    preconfig.utf8_mode = -1;
+
+    status = Py_PreInitialize(&preconfig);
+    if (PyStatus_Exception(status)) {
+        return ret;
+    }
 
     PyConfig_InitIsolatedConfig(&config);
 
@@ -84,29 +101,28 @@ nxt_python3_init_config(nxt_int_t pep405)
         status = PyConfig_SetString(&config, &config.program_name,
                                     nxt_py_home);
         if (PyStatus_Exception(status)) {
-            goto pyinit_exception;
+            goto out_config_clear;
         }
 
     } else {
-        status =PyConfig_SetString(&config, &config.home, nxt_py_home);
+        status = PyConfig_SetString(&config, &config.home, nxt_py_home);
         if (PyStatus_Exception(status)) {
-            goto pyinit_exception;
+            goto out_config_clear;
         }
     }
 
     status = Py_InitializeFromConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto pyinit_exception;
+        goto out_config_clear;
     }
-    PyConfig_Clear(&config);
 
-    return NXT_OK;
+    ret = NXT_OK;
 
-pyinit_exception:
+out_config_clear:
 
     PyConfig_Clear(&config);
 
-    return NXT_ERROR;
+    return ret;
 }
 
 #elif PY_MAJOR_VERSION == 3