Merge branch 'ticket/54'

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -7061,17 +7061,12 @@ PF_CONSOLE_CMD( Python,
 				"string functions, ...",	// Params
 				"Run a cheat command" )
 {
-	std::string extraParms;
+	const char* extraParms = "";
 	if (numParams > 1)
 	{
-		extraParms = "(";
+		extraParms = params[1];
-		extraParms.append(params[1]);
-		extraParms.append(",)");
 	}
-	else
+	PythonInterface::RunFunctionStringArg("xCheat", params[0], extraParms);
-		extraParms = "()";
-
-	PythonInterface::RunFunctionSafe("xCheat", params[0], extraParms.c_str());
 
 	std::string output;
 	// get the messages

Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp

@@ -2102,39 +2102,33 @@ PyObject* PythonInterface::RunFunction(PyObject* module, const char* name, PyObj
 	return result;
 }
 
-PyObject* PythonInterface::ParseArgs(const char* args)
+bool PythonInterface::RunFunctionStringArg(const char* module, const char* name, const char* arg)
-{
-	PyObject* result = NULL;
-	PyObject* scope = PyDict_New();
-	if (scope) 
-	{
-		//- Py_eval_input makes this function accept only single expresion (not statement)
-		//- When using empty scope, functions and classes like 'file' or '__import__' are not visible
-		result = PyRun_String(args, Py_eval_input, scope, NULL);
-		Py_DECREF(scope);
-	}
-   
-	return result;
-}
-
-bool PythonInterface::RunFunctionSafe(const char* module, const char* function, const char* args) 
 {
 	PyObject* moduleObj = ImportModule(module);
 	bool result = false;
 	if (moduleObj) 
 	{
-		PyObject* argsObj = ParseArgs(args);
+		PyObject* argObj = PyString_FromString(arg);
+		if (argObj)
+		{
+			PyObject* argsObj = PyTuple_New(1);
 			if (argsObj)
 			{
-			PyObject* callResult = RunFunction(moduleObj, function, argsObj);
+				// PyTuple_SET_ITEM steals the reference to argObj.
+				PyTuple_SET_ITEM(argsObj, 0, argObj);
+				PyObject* callResult = RunFunction(moduleObj, name, argsObj);
 				if (callResult)
 				{
 					result = true;
 					Py_DECREF(callResult);
 				}
-
 				Py_DECREF(argsObj);
 			}
+			else
+			{
+				Py_DECREF(argObj);
+			}
+		}
 		Py_DECREF(moduleObj);
 	}
 

Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h

@@ -223,9 +223,7 @@ public:
 
 	static PyObject* RunFunction(PyObject* module, const char* name, PyObject* args);
 
-	static PyObject* ParseArgs(const char* args);
+	static bool RunFunctionStringArg(const char* module, const char* name, const char* arg);
-
-	static bool RunFunctionSafe(const char* module, const char* function, const char* args);
 
 	/////////////////////////////////////////////////////////////////////////////
 	//