added support for python 3.7

Roberto De Ioris · Roberto De Ioris · commit 09ca1d5a675e · 2018-06-29T18:03:24.000+02:00
diff --git a/Source/UnrealEnginePython/Private/Blueprint/UEPyEdGraphPin.cpp b/Source/UnrealEnginePython/Private/Blueprint/UEPyEdGraphPin.cpp
@@ -126,7 +126,7 @@ static int py_ue_edgraphpin_set_default_value(ue_PyEdGraphPin *self, PyObject *v
 {
 	if (value && PyUnicode_Check(value))
 	{
-		char *str = PyUnicode_AsUTF8(value);
+		const char *str = UEPyUnicode_AsUTF8(value);
 		self->pin->DefaultValue = UTF8_TO_TCHAR(str);
 		return 0;
 	}
@@ -143,7 +143,7 @@ static int py_ue_edgraphpin_set_default_text_value(ue_PyEdGraphPin *self, PyObje
 {
 	if (value && PyUnicode_Check(value))
 	{
-		char *str = PyUnicode_AsUTF8(value);
+		const char *str = UEPyUnicode_AsUTF8(value);
 		self->pin->DefaultTextValue = FText::FromString(UTF8_TO_TCHAR(str));
 		return 0;
 	}
diff --git a/Source/UnrealEnginePython/Private/PyActor.cpp b/Source/UnrealEnginePython/Private/PyActor.cpp
@@ -273,7 +273,7 @@ FString APyActor::CallPythonActorMethodString(FString method_name, FString args)
 		return FString();
 	}
 
-	char *str_ret = PyUnicode_AsUTF8(py_str);
+	const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 	FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
diff --git a/Source/UnrealEnginePython/Private/PyCharacter.cpp b/Source/UnrealEnginePython/Private/PyCharacter.cpp
@@ -421,7 +421,7 @@ FString APyCharacter::CallPyCharacterMethodString(FString method_name, FString a
 		return FString();
 	}
 
-	char *str_ret = PyUnicode_AsUTF8(py_str);
+	const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 	FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
diff --git a/Source/UnrealEnginePython/Private/PyHUD.cpp b/Source/UnrealEnginePython/Private/PyHUD.cpp
@@ -228,7 +228,7 @@ FString APyHUD::CallPythonHUDMethodString(FString method_name, FString args)
 		return FString();
 	}
 
-	char *str_ret = PyUnicode_AsUTF8(py_str);
+	const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 	FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
diff --git a/Source/UnrealEnginePython/Private/PyPawn.cpp b/Source/UnrealEnginePython/Private/PyPawn.cpp
@@ -225,7 +225,7 @@ FString APyPawn::CallPythonPawnMethodString(FString method_name)
 		return FString();
 	}
 
-	char *str_ret = PyUnicode_AsUTF8(py_str);
+	const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 	FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
diff --git a/Source/UnrealEnginePython/Private/PythonComponent.cpp b/Source/UnrealEnginePython/Private/PythonComponent.cpp
@@ -474,7 +474,7 @@ FString UPythonComponent::CallPythonComponentMethodString(FString method_name, F
 		return FString();
 	}
 
-	char *str_ret = PyUnicode_AsUTF8(py_str);
+	const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 	FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
@@ -567,8 +567,8 @@ TMap<FString, FString> UPythonComponent::CallPythonComponentMethodMap(FString me
 			return output_map;
 		}
 
-		char *str_key = PyUnicode_AsUTF8(py_str_key);
-		char *str_value = PyUnicode_AsUTF8(py_str_value);
+		const char *str_key = UEPyUnicode_AsUTF8(py_str_key);
+		const char *str_value = UEPyUnicode_AsUTF8(py_str_value);
 
 		FString ret_fstring_key = FString(UTF8_TO_TCHAR(str_key));
 		FString ret_fstring_value = FString(UTF8_TO_TCHAR(str_value));
@@ -627,7 +627,7 @@ void UPythonComponent::CallPythonComponentMethodStringArray(FString method_name,
 			return;
 		}
 
-		char *str_ret = PyUnicode_AsUTF8(py_str);
+		const char *str_ret = UEPyUnicode_AsUTF8(py_str);
 
 		FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -342,7 +342,7 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args)
 	}
 	else if (PyUnicodeOrString_Check(obj))
 	{
-		char *class_name = PyUnicode_AsUTF8(obj);
+		const char *class_name = UEPyUnicode_AsUTF8(obj);
 		UClass *u_class = FindObject<UClass>(ANY_PACKAGE, UTF8_TO_TCHAR(class_name));
 		if (u_class)
 		{
@@ -1425,7 +1425,7 @@ PyObject *py_unreal_engine_blueprint_add_member_variable(PyObject * self, PyObje
 
 	if (PyUnicode_Check(py_type))
 	{
-		char *in_type = PyUnicode_AsUTF8(py_type);
+		const char *in_type = UEPyUnicode_AsUTF8(py_type);
 
 		bool is_array = false;
 		if (py_is_array && PyObject_IsTrue(py_is_array))
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.cpp b/Source/UnrealEnginePython/Private/UEPyEngine.cpp
@@ -33,12 +33,11 @@ PyObject *py_unreal_engine_log(PyObject * self, PyObject * args)
 	PyObject *stringified = PyObject_Str(py_message);
 	if (!stringified)
 		return PyErr_Format(PyExc_Exception, "argument cannot be casted to string");
-	char *message = PyUnicode_AsUTF8(stringified);
+	const char *message = UEPyUnicode_AsUTF8(stringified);
 	UE_LOG(LogPython, Log, TEXT("%s"), UTF8_TO_TCHAR(message));
 	Py_DECREF(stringified);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_log_warning(PyObject * self, PyObject * args)
@@ -52,12 +51,11 @@ PyObject *py_unreal_engine_log_warning(PyObject * self, PyObject * args)
 	PyObject *stringified = PyObject_Str(py_message);
 	if (!stringified)
 		return PyErr_Format(PyExc_Exception, "argument cannot be casted to string");
-	char *message = PyUnicode_AsUTF8(stringified);
+	const char *message = UEPyUnicode_AsUTF8(stringified);
 	UE_LOG(LogPython, Warning, TEXT("%s"), UTF8_TO_TCHAR(message));
 	Py_DECREF(stringified);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_log_error(PyObject * self, PyObject * args)
@@ -71,12 +69,11 @@ PyObject *py_unreal_engine_log_error(PyObject * self, PyObject * args)
 	PyObject *stringified = PyObject_Str(py_message);
 	if (!stringified)
 		return PyErr_Format(PyExc_Exception, "argument cannot be casted to string");
-	char *message = PyUnicode_AsUTF8(stringified);
+	const char *message = UEPyUnicode_AsUTF8(stringified);
 	UE_LOG(LogPython, Error, TEXT("%s"), UTF8_TO_TCHAR(message));
 	Py_DECREF(stringified);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_add_on_screen_debug_message(PyObject * self, PyObject * args)
@@ -98,14 +95,13 @@ PyObject *py_unreal_engine_add_on_screen_debug_message(PyObject * self, PyObject
 	PyObject *stringified = PyObject_Str(py_message);
 	if (!stringified)
 		return PyErr_Format(PyExc_Exception, "argument cannot be casted to string");
-	char *message = PyUnicode_AsUTF8(stringified);
+	const char *message = UEPyUnicode_AsUTF8(stringified);
 
 	GEngine->AddOnScreenDebugMessage(key, time_to_display, FColor::Green, FString::Printf(TEXT("%s"), UTF8_TO_TCHAR(message)));
 
 	Py_DECREF(stringified);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_print_string(PyObject * self, PyObject * args)
@@ -137,7 +133,7 @@ PyObject *py_unreal_engine_print_string(PyObject * self, PyObject * args)
 	PyObject *stringified = PyObject_Str(py_message);
 	if (!stringified)
 		return PyErr_Format(PyExc_Exception, "argument cannot be casted to string");
-	char *message = PyUnicode_AsUTF8(stringified);
+	const char *message = UEPyUnicode_AsUTF8(stringified);
 
 	GEngine->AddOnScreenDebugMessage(-1, timeout, color, FString(UTF8_TO_TCHAR(message)));
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp b/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp
@@ -7,7 +7,7 @@ static PyObject *ue_PyEnumsImporter_getattro(ue_PyEnumsImporter *self, PyObject
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
-			char *attr = PyUnicode_AsUTF8(attr_name);
+			const char *attr = UEPyUnicode_AsUTF8(attr_name);
 			if (attr[0] != '_')
 			{
 				UEnum *u_enum = FindObject<UEnum>(ANY_PACKAGE, UTF8_TO_TCHAR(attr));
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -1081,7 +1081,7 @@ static PyObject *ue_PyUObject_getattro(ue_PyUObject *self, PyObject *attr_name)
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
-			char *attr = PyUnicode_AsUTF8(attr_name);
+			const char *attr = UEPyUnicode_AsUTF8(attr_name);
 			// first check for property
 			UStruct *u_struct = nullptr;
 			if (self->ue_object->IsA<UStruct>())
@@ -1180,7 +1180,7 @@ static int ue_PyUObject_setattro(ue_PyUObject *self, PyObject *attr_name, PyObje
 	// first of all check for UProperty
 	if (PyUnicodeOrString_Check(attr_name))
 	{
-		char *attr = PyUnicode_AsUTF8(attr_name);
+		char *attr = (char *)PyUnicode_AsUTF8(attr_name);
 		// first check for property
 		UStruct *u_struct = nullptr;
 		if (self->ue_object->IsA<UStruct>())
@@ -1287,7 +1287,7 @@ static PyObject *ue_PyUObject_call(ue_PyUObject *self, PyObject *args, PyObject
 				}
 				if (!PyUnicodeOrString_Check(key))
 					continue;
-				char *struct_key = PyUnicode_AsUTF8(key);
+				const char *struct_key = UEPyUnicode_AsUTF8(key);
 
 				PyObject *value = PyDict_GetItem(kw, key);
 				if (!value)
@@ -1300,7 +1300,7 @@ static PyObject *ue_PyUObject_call(ue_PyUObject *self, PyObject *args, PyObject
 					break;
 				}
 
-				UProperty *u_property = ue_struct_get_field_from_name(u_script_struct, struct_key);
+				UProperty *u_property = ue_struct_get_field_from_name(u_script_struct, (char *)struct_key);
 				if (u_property)
 				{
 					if (!ue_py_convert_pyobject(value, u_property, data, 0))
@@ -2960,7 +2960,7 @@ UFunction *unreal_engine_add_function(UClass *u_class, char *name, PyObject *py_
 		if (!PyUnicodeOrString_Check(key))
 			continue;
 
-		char *p_name = PyUnicode_AsUTF8(key);
+		const char *p_name = UEPyUnicode_AsUTF8(key);
 
 		PyObject *value = PyDict_GetItem(annotations, key);
 		if (!value)
diff --git a/Source/UnrealEnginePython/Private/UEPySubclassing.cpp b/Source/UnrealEnginePython/Private/UEPySubclassing.cpp
@@ -31,9 +31,9 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 		PyObject *class_attributes = PyTuple_GetItem(args, 2);
 
 		PyObject *class_name = PyDict_GetItemString(class_attributes, (char *)"__qualname__");
-		char *name = PyUnicode_AsUTF8(class_name);
+		const char *name = UEPyUnicode_AsUTF8(class_name);
 		// check if parent is a uclass
-		UClass *new_class = unreal_engine_new_uclass(name, (UClass *)parent->ue_object);
+		UClass *new_class = unreal_engine_new_uclass((char *)name, (UClass *)parent->ue_object);
 		if (!new_class)
 			return -1;
 
@@ -59,7 +59,7 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 			}
 			if (!PyUnicodeOrString_Check(key))
 				continue;
-			char *class_key = PyUnicode_AsUTF8(key);
+			const char *class_key = UEPyUnicode_AsUTF8(key);
 
 			PyObject *value = PyDict_GetItem(class_attributes, key);
 
@@ -277,15 +277,15 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 				PyObject *override_name = PyObject_GetAttrString(value, (char *)"override");
 				if (override_name && PyUnicodeOrString_Check(override_name))
 				{
-					class_key = PyUnicode_AsUTF8(override_name);
+					class_key = UEPyUnicode_AsUTF8(override_name);
 				}
 				else if (override_name && PyUnicodeOrString_Check(override_name))
 				{
-					class_key = PyUnicode_AsUTF8(override_name);
+					class_key = UEPyUnicode_AsUTF8(override_name);
 				}
 				else if (!override_name)
 					PyErr_Clear();
-				if (!unreal_engine_add_function(new_class, class_key, value, func_flags))
+				if (!unreal_engine_add_function(new_class, (char *)class_key, value, func_flags))
 				{
 					UE_LOG(LogPython, Error, TEXT("unable to add function %s"), UTF8_TO_TCHAR(class_key));
 					return -1;
@@ -340,7 +340,7 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 							PyObject *mc_key = PyList_GetItem(keys, i);
 							PyObject *mc_value = PyDict_GetItem(found_additional_props, mc_key);
 
-							char *mc_name = PyUnicode_AsUTF8(mc_key);
+							const char *mc_name = UEPyUnicode_AsUTF8(mc_key);
 							UProperty *u_property = ObjectInitializer.GetObj()->GetClass()->FindPropertyByName(FName(UTF8_TO_TCHAR(mc_name)));
 							if (u_property)
 							{
@@ -380,7 +380,7 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 						PyObject *value = PyDict_GetItem(u_py_class_casted->py_uobject->py_dict, key);
 						if (PyUnicode_Check(key))
 						{
-							char *key_name = PyUnicode_AsUTF8(key);
+							const char *key_name = UEPyUnicode_AsUTF8(key);
 							if (!strcmp(key_name, (char *)"__additional_uproperties__"))
 								continue;
 						}
diff --git a/Source/UnrealEnginePython/Private/UEPyUClassesImporter.cpp b/Source/UnrealEnginePython/Private/UEPyUClassesImporter.cpp
@@ -7,7 +7,7 @@ static PyObject *ue_PyUClassesImporter_getattro(ue_PyUClassesImporter *self, PyO
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
-			char *attr = PyUnicode_AsUTF8(attr_name);
+			const char *attr = UEPyUnicode_AsUTF8(attr_name);
 			if (attr[0] != '_')
 			{
 				UClass *u_class = FindObject<UClass>(ANY_PACKAGE, UTF8_TO_TCHAR(attr));
diff --git a/Source/UnrealEnginePython/Private/UEPyUScriptStruct.cpp b/Source/UnrealEnginePython/Private/UEPyUScriptStruct.cpp
@@ -186,9 +186,9 @@ static PyObject *ue_PyUScriptStruct_getattro(ue_PyUScriptStruct *self, PyObject
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
-			char *attr = PyUnicode_AsUTF8(attr_name);
+			const char *attr = UEPyUnicode_AsUTF8(attr_name);
 			// first check for property
-			UProperty *u_property = get_field_from_name(self->u_struct, attr);
+			UProperty *u_property = get_field_from_name(self->u_struct, (char *)attr);
 			if (u_property)
 			{
 				// swallow previous exception
@@ -205,9 +205,9 @@ static int ue_PyUScriptStruct_setattro(ue_PyUScriptStruct *self, PyObject *attr_
 	// first of all check for UProperty
 	if (PyUnicodeOrString_Check(attr_name))
 	{
-		char *attr = PyUnicode_AsUTF8(attr_name);
+		const char *attr = UEPyUnicode_AsUTF8(attr_name);
 		// first check for property
-		UProperty *u_property = get_field_from_name(self->u_struct, attr);
+		UProperty *u_property = get_field_from_name(self->u_struct, (char *)attr);
 		if (u_property)
 		{
 			if (ue_py_convert_pyobject(value, u_property, self->data, 0))
diff --git a/Source/UnrealEnginePython/Private/UEPyUStructsImporter.cpp b/Source/UnrealEnginePython/Private/UEPyUStructsImporter.cpp
@@ -7,7 +7,7 @@ static PyObject *ue_PyUStructsImporter_getattro(ue_PyUStructsImporter *self, PyO
 	{
 		if (PyUnicodeOrString_Check(attr_name))
 		{
-			char *attr = PyUnicode_AsUTF8(attr_name);
+			const char *attr = UEPyUnicode_AsUTF8(attr_name);
 			if (attr[0] != '_')
 			{
 				UScriptStruct *u_struct = FindObject<UScriptStruct>(ANY_PACKAGE, UTF8_TO_TCHAR(attr));
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp b/Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp
@@ -73,8 +73,7 @@ PyObject *py_ue_sequencer_changed(ue_PyUObject *self, PyObject * args)
 
 	}
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 #endif
 
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -27,9 +27,10 @@ void init_unreal_engine_builtin();
 const char *ue4_module_options = "linux_global_symbols";
 #endif
 
-#if PY_MAJOR_VERSION < 3
-char *PyUnicode_AsUTF8(PyObject *py_str)
+
+const char *UEPyUnicode_AsUTF8(PyObject *py_str)
 {
+#if PY_MAJOR_VERSION < 3
 	if (PyUnicode_Check(py_str))
 	{
 		PyObject *unicode = PyUnicode_AsUTF8String(py_str);
@@ -40,9 +41,15 @@ char *PyUnicode_AsUTF8(PyObject *py_str)
 		// just a hack to avoid crashes
 		return (char *)"<invalid_string>";
 	}
-	return PyString_AsString(py_str);
+	return (const char *)PyString_AsString(py_str);
+#elif PY_MINOR_VERSION < 7
+	return (const char *)PyUnicode_AsUTF8(py_str);
+#else
+	return PyUnicode_AsUTF8(py_str);
+#endif
 }
 
+#if PY_MAJOR_VERSION < 3
 int PyGILState_Check()
 {
 	PyThreadState * tstate = _PyThreadState_Current;
@@ -434,7 +441,7 @@ FString FUnrealEnginePythonModule::Pep8ize(FString Code)
 		return Code;
 	}
 
-	char *pep8ized = PyUnicode_AsUTF8(ret);
+	const char *pep8ized = UEPyUnicode_AsUTF8(ret);
 	FString NewCode = FString(pep8ized);
 	Py_DECREF(ret);
 
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFStringAssetReference.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFStringAssetReference.cpp
@@ -73,7 +73,7 @@ static int ue_py_fstring_asset_reference_init(ue_PyFStringAssetReference *self,
 
 	if (PyUnicode_Check(py_object))
 	{
-		char *value = PyUnicode_AsUTF8(py_object);
+		const char *value = UEPyUnicode_AsUTF8(py_object);
 		self->fstring_asset_reference = FStringAssetReference(FString(UTF8_TO_TCHAR(value)));
 		return 0;
 	}
diff --git a/Source/UnrealEnginePython/Public/UnrealEnginePython.h b/Source/UnrealEnginePython/Public/UnrealEnginePython.h
@@ -60,8 +60,10 @@ UNREALENGINEPYTHON_API PyObject *ue_py_register_module(const char *);
 		return -1;\
 	}
 
+
+const char *UEPyUnicode_AsUTF8(PyObject *py_str);
+
 #if PY_MAJOR_VERSION < 3
-char *PyUnicode_AsUTF8(PyObject *py_str);
 int PyGILState_Check();
 #endif
 bool PyUnicodeOrString_Check(PyObject *py_obj);
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static int py_ue_edgraphpin_set_default_value(ue_PyEdGraphPin self, PyObject v`
`126`	`126`	`{`
`127`	`127`	`if (value && PyUnicode_Check(value))`
`128`	`128`	`{`
`129`		`- char *str = PyUnicode_AsUTF8(value);`
	`129`	`+ const char *str = UEPyUnicode_AsUTF8(value);`
`130`	`130`	`self->pin->DefaultValue = UTF8_TO_TCHAR(str);`
`131`	`131`	`return 0;`
`132`	`132`	`}`
`@@ -143,7 +143,7 @@ static int py_ue_edgraphpin_set_default_text_value(ue_PyEdGraphPin *self, PyObje`
`143`	`143`	`{`
`144`	`144`	`if (value && PyUnicode_Check(value))`
`145`	`145`	`{`
`146`		`- char *str = PyUnicode_AsUTF8(value);`
	`146`	`+ const char *str = UEPyUnicode_AsUTF8(value);`
`147`	`147`	`self->pin->DefaultTextValue = FText::FromString(UTF8_TO_TCHAR(str));`
`148`	`148`	`return 0;`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ FString APyActor::CallPythonActorMethodString(FString method_name, FString args)`
`273`	`273`	`return FString();`
`274`	`274`	`}`
`275`	`275`
`276`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`276`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`277`	`277`
`278`	`278`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`279`	`279`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ FString APyCharacter::CallPyCharacterMethodString(FString method_name, FString a`
`421`	`421`	`return FString();`
`422`	`422`	`}`
`423`	`423`
`424`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`424`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`425`	`425`
`426`	`426`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`427`	`427`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ FString APyHUD::CallPythonHUDMethodString(FString method_name, FString args)`
`228`	`228`	`return FString();`
`229`	`229`	`}`
`230`	`230`
`231`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`231`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`232`	`232`
`233`	`233`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ FString APyPawn::CallPythonPawnMethodString(FString method_name)`
`225`	`225`	`return FString();`
`226`	`226`	`}`
`227`	`227`
`228`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`228`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`229`	`229`
`230`	`230`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ FString UPythonComponent::CallPythonComponentMethodString(FString method_name, F`
`474`	`474`	`return FString();`
`475`	`475`	`}`
`476`	`476`
`477`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`477`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`478`	`478`
`479`	`479`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`480`	`480`
`@@ -567,8 +567,8 @@ TMap<FString, FString> UPythonComponent::CallPythonComponentMethodMap(FString me`
`567`	`567`	`return output_map;`
`568`	`568`	`}`
`569`	`569`
`570`		`- char *str_key = PyUnicode_AsUTF8(py_str_key);`
`571`		`- char *str_value = PyUnicode_AsUTF8(py_str_value);`
	`570`	`+ const char *str_key = UEPyUnicode_AsUTF8(py_str_key);`
	`571`	`+ const char *str_value = UEPyUnicode_AsUTF8(py_str_value);`
`572`	`572`
`573`	`573`	`FString ret_fstring_key = FString(UTF8_TO_TCHAR(str_key));`
`574`	`574`	`FString ret_fstring_value = FString(UTF8_TO_TCHAR(str_value));`
`@@ -627,7 +627,7 @@ void UPythonComponent::CallPythonComponentMethodStringArray(FString method_name,`
`627`	`627`	`return;`
`628`	`628`	`}`
`629`	`629`
`630`		`- char *str_ret = PyUnicode_AsUTF8(py_str);`
	`630`	`+ const char *str_ret = UEPyUnicode_AsUTF8(py_str);`
`631`	`631`
`632`	`632`	`FString ret_fstring = FString(UTF8_TO_TCHAR(str_ret));`
`633`	`633`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ PyObject py_unreal_engine_import_asset(PyObject self, PyObject * args)`
`342`	`342`	`}`
`343`	`343`	`else if (PyUnicodeOrString_Check(obj))`
`344`	`344`	`{`
`345`		`- char *class_name = PyUnicode_AsUTF8(obj);`
	`345`	`+ const char *class_name = UEPyUnicode_AsUTF8(obj);`
`346`	`346`	`UClass *u_class = FindObject<UClass>(ANY_PACKAGE, UTF8_TO_TCHAR(class_name));`
`347`	`347`	`if (u_class)`
`348`	`348`	`{`
`@@ -1425,7 +1425,7 @@ PyObject py_unreal_engine_blueprint_add_member_variable(PyObject self, PyObje`
`1425`	`1425`
`1426`	`1426`	`if (PyUnicode_Check(py_type))`
`1427`	`1427`	`{`
`1428`		`- char *in_type = PyUnicode_AsUTF8(py_type);`
	`1428`	`+ const char *in_type = UEPyUnicode_AsUTF8(py_type);`
`1429`	`1429`
`1430`	`1430`	`bool is_array = false;`
`1431`	`1431`	`if (py_is_array && PyObject_IsTrue(py_is_array))`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ static PyObject ue_PyEnumsImporter_getattro(ue_PyEnumsImporter self, PyObject`
`7`	`7`	`{`
`8`	`8`	`if (PyUnicodeOrString_Check(attr_name))`
`9`	`9`	`{`
`10`		`- char *attr = PyUnicode_AsUTF8(attr_name);`
	`10`	`+ const char *attr = UEPyUnicode_AsUTF8(attr_name);`
`11`	`11`	`if (attr[0] != '_')`
`12`	`12`	`{`
`13`	`13`	`UEnum *u_enum = FindObject<UEnum>(ANY_PACKAGE, UTF8_TO_TCHAR(attr));`