beter python2 support [2]

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/Http/UEPyIHttpRequest.cpp

@@ -72,7 +72,7 @@ static PyObject *py_ue_ihttp_request_set_content(ue_PyIHttpRequest *self, PyObje
 		return NULL;
 	}
 
-	if (PyUnicode_Check(py_obj))
+	if (PyUnicodeOrString_Check(py_obj))
 	{
 		self->http_request->SetContentAsString(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(py_obj)));
 	}

Source/UnrealEnginePython/Private/Slate/UEPySPythonShelf.cpp

@@ -121,7 +121,7 @@ static int ue_py_spython_shelf_init(ue_PySPythonShelf *self, PyObject *args, PyO
 	{
 		while (PyObject *item = PyIter_Next(py_classes_iterable))
 		{
-			if (PyUnicode_Check(item))
+			if (PyUnicodeOrString_Check(item))
 			{
 				FName class_name = FName(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(item)));
 				asset_picker_config.Filter.ClassNames.Add(class_name);
@@ -134,7 +134,7 @@ static int ue_py_spython_shelf_init(ue_PySPythonShelf *self, PyObject *args, PyO
 	{
 		while (PyObject *item = PyIter_Next(py_collections_iterable))
 		{
-			if (PyUnicode_Check(item))
+			if (PyUnicodeOrString_Check(item))
 			{
 				FName collection_name = FName(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(item)));
 				asset_picker_config.Collections.Add(FCollectionNameType(collection_name, ECollectionShareType::CST_Local));

Source/UnrealEnginePython/Private/UEPyAssetUserData.cpp

@@ -53,7 +53,7 @@ PyObject *py_ue_asset_import_data_set_sources(ue_PyUObject * self, PyObject * ar
 		return PyErr_Format(PyExc_Exception, "UObject does not have asset import data.");
 	}
 
-	if (PyUnicode_Check(py_files))
+	if (PyUnicodeOrString_Check(py_files))
 	{
 		filenames.Add(FString(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(py_files))));
 	}
@@ -67,7 +67,7 @@ PyObject *py_ue_asset_import_data_set_sources(ue_PyUObject * self, PyObject * ar
 
 		while (PyObject *py_item = PyIter_Next(py_iter))
 		{
-			if (!PyUnicode_Check(py_item))
+			if (!PyUnicodeOrString_Check(py_item))
 			{
 				Py_DECREF(py_iter);
 				return PyErr_Format(PyExc_Exception, "argument is not a string or an interable of strings");

Source/UnrealEnginePython/Private/UEPyEditor.cpp

@@ -1480,7 +1480,7 @@ PyObject *py_unreal_engine_blueprint_add_member_variable(PyObject * self, PyObje
 
 	FEdGraphPinType pin;
 
-	if (PyUnicode_Check(py_type))
+	if (PyUnicodeOrString_Check(py_type))
 	{
 		const char *in_type = UEPyUnicode_AsUTF8(py_type);
 

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -2638,7 +2638,7 @@ void ue_bind_events_for_py_class_by_attribute(UObject *u_obj, PyObject *py_class
 			PyObject *event_signature = PyObject_GetAttrString(item, (char*)"ue_event");
 			if (event_signature)
 			{
-				if (PyUnicode_Check(event_signature))
+				if (PyUnicodeOrString_Check(event_signature))
 				{
 					FString event_name = FString(UTF8_TO_TCHAR(UEPyUnicode_AsUTF8(event_signature)));
 					TArray<FString> parts;

Source/UnrealEnginePython/Private/UEPySubclassing.cpp

@@ -378,7 +378,7 @@ int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *kwds)
 					{
 						PyObject *key = PyList_GetItem(keys, i);
 						PyObject *value = PyDict_GetItem(u_py_class_casted->py_uobject->py_dict, key);
-						if (PyUnicode_Check(key))
+						if (PyUnicodeOrString_Check(key))
 						{
 							const char *key_name = UEPyUnicode_AsUTF8(key);
 							if (!strcmp(key_name, (char *)"__additional_uproperties__"))

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -561,7 +561,7 @@ FString FUnrealEnginePythonModule::Pep8ize(FString Code)
 		return Code;
 	}
 
-	if (!PyUnicode_Check(ret))
+	if (!PyUnicodeOrString_Check(ret))
 	{
 		UE_LOG(LogPython, Error, TEXT("returned value is not a string"));
 		// return the original string to avoid losing data

Source/UnrealEnginePython/Private/Wrappers/UEPyFStringAssetReference.cpp

@@ -71,7 +71,7 @@ static int ue_py_fstring_asset_reference_init(ue_PyFStringAssetReference *self,
 	if (!PyArg_ParseTuple(args, "O", &py_object))
 		return -1;
 
-	if (PyUnicode_Check(py_object))
+	if (PyUnicodeOrString_Check(py_object))
 	{
 		const char *value = UEPyUnicode_AsUTF8(py_object);
 		self->fstring_asset_reference = FStringAssetReference(FString(UTF8_TO_TCHAR(value)));