setlocale

Author: crazytuzi

Source/UnrealEnginePython/Private/Slate/UEPySPythonEditorViewport.cpp

@@ -1,6 +1,6 @@
 
 #include "UEPySPythonEditorViewport.h"
-#if ENGINE_MAJOR_VERSION == 5
+#if WITH_EDITOR && ENGINE_MAJOR_VERSION == 5
 #include "UnrealWidget.h"
 #endif
 

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -843,7 +843,9 @@ static PyMethodDef ue_PyUObject_methods[] = {
 
 
 	{ "get_class", (PyCFunction)py_ue_get_class, METH_VARARGS, "" },
+#if WITH_EDITOR
 	{ "class_generated_by", (PyCFunction)py_ue_class_generated_by, METH_VARARGS, "" },
+#endif
 	{ "class_get_flags", (PyCFunction)py_ue_class_get_flags, METH_VARARGS, "" },
 	{ "class_set_flags", (PyCFunction)py_ue_class_set_flags, METH_VARARGS, "" },
 	{ "get_obj_flags", (PyCFunction)py_ue_get_obj_flags, METH_VARARGS, "" },

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -30,6 +30,7 @@ PyObject *py_ue_get_class(ue_PyUObject * self, PyObject * args)
 	Py_RETURN_UOBJECT(self->ue_object->GetClass());
 }
 
+#if WITH_EDITOR
 PyObject *py_ue_class_generated_by(ue_PyUObject * self, PyObject * args)
 {
 
@@ -45,6 +46,7 @@ PyObject *py_ue_class_generated_by(ue_PyUObject * self, PyObject * args)
 
 	Py_RETURN_UOBJECT(u_object);
 }
+#endif
 
 PyObject *py_ue_class_get_flags(ue_PyUObject * self, PyObject * args)
 {

Source/UnrealEnginePython/Private/UObject/UEPyWorld.cpp

@@ -316,7 +316,7 @@ PyObject *py_ue_set_current_level(ue_PyUObject *self, PyObject * args)
 	if (!level)
 		return PyErr_Format(PyExc_Exception, "argument is not a ULevel");
 
-#if WITH_EDITOR || ENGINE_MINOR_VERSION < 22
+#if WITH_EDITOR || !(ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 22))
 
 	if (world->SetCurrentLevel(level))
 		Py_RETURN_TRUE;

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -262,6 +262,17 @@ void FUnrealEnginePythonModule::StartupModule()
 {
 	BrutalFinalize = false;
 
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7
+	// Python 3.7+ changes the C locale which affects functions using C string APIs
+	// So change the C locale back to its current setting after Py_Initialize has been called
+	FString CurrentLocale;
+
+	if (const char* CurrentLocalePtr = setlocale(LC_ALL, nullptr))
+	{
+		CurrentLocale = ANSI_TO_TCHAR(CurrentLocalePtr);
+	}
+#endif
+
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
 	FString PythonHome;
 	if (GConfig->GetString(UTF8_TO_TCHAR("Python"), UTF8_TO_TCHAR("Home"), PythonHome, GEngineIni))
@@ -523,6 +534,14 @@ void FUnrealEnginePythonModule::StartupModule()
 #endif
 #endif
 
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7
+	// We call setlocale here to restore the previous state
+	if (!CurrentLocale.IsEmpty())
+	{
+		setlocale(LC_ALL, TCHAR_TO_ANSI(*CurrentLocale));
+	}
+#endif
+
 	UESetupPythonInterpreter(true);
 
 	main_module = PyImport_AddModule("__main__");