Python2 is now officially supported on windows, mac support will come in next commit

Author: Roberto De Ioris

Source/PythonConsole/Private/PythonConsolePrivatePCH.h

@@ -6,9 +6,4 @@
 #include "PythonConsoleModule.h"
 #include "SlateBasics.h"
 
-#if UNREAL_ENGINE_PYTHON_ON_MAC
-#include <python3.5m/Python.h>
-#else
-#include <include/Python.h>
-#endif
 

Source/PythonConsole/Private/SPythonLog.cpp

@@ -128,9 +128,7 @@ SPythonConsoleInputBox::SPythonConsoleInputBox()
 	: bIgnoreUIUpdate(false)
 {
 	FScopePythonGIL gil;
-	PyObject *main_module = PyImport_AddModule("__main__");
-	main_dict = PyModule_GetDict(main_module);
-	local_dict = PyDict_New();
+	
 }
 
 BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
@@ -181,82 +179,10 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 
 			// Here run the python code
 			//
-			FScopePythonGIL gil;
+			FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
+			PythonModule.RunString(TCHAR_TO_UTF8(*ExecString));
 
-			PyObject *eval_ret = PyRun_String(TCHAR_TO_UTF8(*ExecString), Py_file_input, main_dict, local_dict);
-
-			if (eval_ret) {
-				Py_DECREF(eval_ret);
-			}
-
-
-			if (PyErr_Occurred()) {
-				PyObject *type = NULL;
-				PyObject *value = NULL;
-				PyObject *traceback = NULL;
-
-				PyErr_Fetch(&type, &value, &traceback);
-				PyErr_NormalizeException(&type, &value, &traceback);
-
-				if (!value) {
-					PyErr_Clear();
-					OnConsoleCommandExecuted.ExecuteIfBound();
-					return;
-				}
-
-				char *msg = NULL;
-				PyObject *zero = PyUnicode_AsUTF8String(PyObject_Str(value));
-				if (zero) {
-					msg = PyBytes_AsString(zero);
-				}
-
-				if (!msg) {
-					PyErr_Clear();
-					OnConsoleCommandExecuted.ExecuteIfBound();
-					return;
-				}
-
-				UE_LOG(LogTemp, Error, TEXT("%s"), UTF8_TO_TCHAR(msg));
-
-				// taken from uWSGI ;)
-				if (!traceback) {
-					PyErr_Clear();
-					OnConsoleCommandExecuted.ExecuteIfBound();
-					return;
-				}
-
-				PyObject *traceback_module = PyImport_ImportModule("traceback");
-				if (!traceback_module) {
-					PyErr_Clear();
-					OnConsoleCommandExecuted.ExecuteIfBound();
-					return;
-				}
-
-				PyObject *traceback_dict = PyModule_GetDict(traceback_module);
-				PyObject *format_exception = PyDict_GetItemString(traceback_dict, "format_exception");
-
-				if (format_exception) {
-					PyObject *ret = PyObject_CallFunctionObjArgs(format_exception, type, value, traceback, NULL);
-					if (!ret) {
-						PyErr_Clear();
-						OnConsoleCommandExecuted.ExecuteIfBound();
-						return;
-					}
-
-					if (PyList_Check(ret)) {
-						for (int i = 0; i < PyList_Size(ret); i++) {
-							PyObject *item = PyList_GetItem(ret, i);
-							if (item) {
-								UE_LOG(LogTemp, Error, TEXT("%s"), UTF8_TO_TCHAR(PyUnicode_AsUTF8(PyObject_Str(item))));
-							}
-						}
-					}
-					else {
-						UE_LOG(LogTemp, Error, TEXT("%s"), UTF8_TO_TCHAR(PyUnicode_AsUTF8(PyObject_Str(ret))));
-					}
-				}
-				PyErr_Clear();
-			}
+			
 		}
 
 	}

Source/PythonConsole/Private/SPythonLog.h

@@ -78,9 +78,6 @@ class SPythonConsoleInputBox
 
 	/** to prevent recursive calls in UI callback */
 	bool bIgnoreUIUpdate;
-
-	PyObject *main_dict;
-	PyObject *local_dict;
 };
 
 /**

Source/PythonConsole/PythonConsole.Build.cs

@@ -6,15 +6,6 @@
 public class PythonConsole : ModuleRules
 {
 
-    private const string pythonHome = "python35";
-
-    protected string PythonHome
-    {
-        get
-        {
-            return Path.GetFullPath(Path.Combine(ModuleDirectory, "..", "..", pythonHome));
-        }
-    }
 
     public PythonConsole(TargetInfo Target)
 	{
@@ -40,17 +31,5 @@ public PythonConsole(TargetInfo Target)
             }
 		);
 
-        if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
-        {
-            PublicIncludePaths.Add(PythonHome);
-            PublicAdditionalLibraries.Add(Path.Combine(PythonHome, "libs", "python35.lib"));
-        }
-        else if (Target.Platform == UnrealTargetPlatform.Mac)
-        {
-            string mac_python = "/Library/Frameworks/Python.framework/Versions/3.5/";
-            PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
-            PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython3.5m.dylib"));
-            Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC=1"));
-        }
     }
 }

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -32,6 +32,7 @@ DEFINE_LOG_CATEGORY(LogPython);
 
 PyDoc_STRVAR(unreal_engine_py_doc, "Unreal Engine Python module.");
 
+#if PY_MAJOR_VERSION >= 3
 static PyModuleDef unreal_engine_module = {
 	PyModuleDef_HEAD_INIT,
 	"unreal_engine",
@@ -40,11 +41,14 @@ static PyModuleDef unreal_engine_module = {
 	NULL,
 };
 
-UPythonGCManager *PythonGCManager;
-
 static PyObject *init_unreal_engine(void) {
 	return PyModule_Create(&unreal_engine_module);
 }
+#endif
+
+UPythonGCManager *PythonGCManager;
+
+
 
 
 static PyMethodDef unreal_engine_methods[] = {
@@ -447,8 +451,13 @@ static PyTypeObject ue_PyUObjectType = {
 
 
 void unreal_engine_init_py_module() {
+#if PY_MAJOR_VERSION >= 3
 	PyImport_AppendInittab("unreal_engine", init_unreal_engine);
 	PyObject *new_unreal_engine_module = PyImport_AddModule("unreal_engine");
+#else
+	PyObject *new_unreal_engine_module = Py_InitModule3("unreal_engine", NULL, unreal_engine_py_doc);
+#endif
+	
 
 	PyObject *unreal_engine_dict = PyModule_GetDict(new_unreal_engine_module);
 
@@ -591,11 +600,14 @@ void unreal_engine_py_log_error() {
 	}
 
 	char *msg = NULL;
+#if PY_MAJOR_VERSION >= 3
 	PyObject *zero = PyUnicode_AsUTF8String(PyObject_Str(value));
 	if (zero) {
 		msg = PyBytes_AsString(zero);
 	}
-
+#else
+	msg = PyString_AsString(PyObject_Str(value));
+#endif
 	if (!msg) {
 		PyErr_Clear();
 		return;

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -4,6 +4,20 @@
 
 void unreal_engine_init_py_module();
 
+#if PY_MAJOR_VERSION < 3
+char *PyUnicode_AsUTF8(PyObject *py_str) {
+	if (PyUnicode_Check(py_str)) {
+		PyObject *unicode = PyUnicode_AsUTF8String(py_str);
+		if (unicode) {
+			return PyString_AsString(unicode);
+		}
+		// just a hack to avoid crashes
+		return (char *)"<invalid_string>";
+	}
+	return PyString_AsString(py_str);
+}
+#endif
+
 
 #define LOCTEXT_NAMESPACE "FUnrealEnginePythonModule"
 
@@ -25,7 +39,11 @@ void FUnrealEnginePythonModule::StartupModule()
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
 
 	Py_Initialize();
+#if PY_MAJOR_VERSION >= 3
 	wchar_t *argv[] = { UTF8_TO_TCHAR("UnrealEngine"), NULL };
+#else
+	char *argv[] = { (char *)"UnrealEngine", NULL };
+#endif
 	PySys_SetArgv(1, argv);
 
 	PyEval_InitThreads();
@@ -57,6 +75,10 @@ void FUnrealEnginePythonModule::StartupModule()
 		unreal_engine_py_log_error();
 	}
 
+	PyObject *main_module = PyImport_AddModule("__main__");
+	main_dict = PyModule_GetDict(main_module);
+	local_dict = PyDict_New();
+
 	// release the GIL
 	PythonGILRelease();
 }
@@ -71,6 +93,16 @@ void FUnrealEnginePythonModule::ShutdownModule()
 	Py_Finalize();
 }
 
+void FUnrealEnginePythonModule::RunString(char *str) {
+	FScopePythonGIL gil;
+	PyObject *eval_ret = PyRun_String(str, Py_file_input, (PyObject *)main_dict, (PyObject *)local_dict);
+	if (!eval_ret) {
+		unreal_engine_py_log_error();
+		return;
+	}
+	Py_DECREF(eval_ret);
+}
+
 #undef LOCTEXT_NAMESPACE
 
 IMPLEMENT_MODULE(FUnrealEnginePythonModule, UnrealEnginePython)

Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h

@@ -36,3 +36,6 @@
 #define ue_py_check(py_u) if (!py_u->ue_object || !py_u->ue_object->IsValidLowLevel() || py_u->ue_object->IsPendingKillOrUnreachable())\
 							return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state")
 
+#if PY_MAJOR_VERSION < 3
+char *PyUnicode_AsUTF8(PyObject *py_str);
+#endif

Source/UnrealEnginePython/Public/UnrealEnginePython.h

@@ -17,8 +17,13 @@ class UNREALENGINEPYTHON_API FUnrealEnginePythonModule : public IModuleInterface
 	virtual void StartupModule() override;
 	virtual void ShutdownModule() override;
 
+	void RunString(char *);
+
 private:
 	void *ue_python_gil;
+	// used by console
+	void *main_dict;
+	void *local_dict;
 };
 
 struct FScopePythonGIL {
@@ -40,3 +45,6 @@ struct FScopePythonGIL {
 	FUnrealEnginePythonModule UnrealEnginePythonModule;
 };
 
+
+
+

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -7,6 +7,7 @@ public class UnrealEnginePython : ModuleRules
 {
 
     private const string pythonHome = "python35";
+    //private const string pythonHome = "python27";
 
     protected string PythonHome
     {
@@ -79,13 +80,21 @@ public UnrealEnginePython(TargetInfo Target)
         if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
         {
             PublicIncludePaths.Add(PythonHome);
-            PublicAdditionalLibraries.Add(Path.Combine(PythonHome, "libs", "python35.lib"));
+            PublicAdditionalLibraries.Add(Path.Combine(PythonHome, "libs", string.Format("{0}.lib", pythonHome)));
         }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
-            string mac_python = "/Library/Frameworks/Python.framework/Versions/3.5/";
-            PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
-            PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython3.5m.dylib"));
+            if (pythonHome == "python35")
+            {
+                string mac_python = "/Library/Frameworks/Python.framework/Versions/3.5/";
+                PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
+                PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython3.5m.dylib"));
+            }
+            else if (pythonHome == "python27") {
+                string mac_python = "/Library/Frameworks/Python.framework/Versions/2.7/";
+                PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
+                PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython2.7.dylib"));
+            }
             Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC=1"));
         }