Changes in src/Python/PythonScripting.cpp [57388c9:2cf12a]

File:

• src/Python/PythonScripting.cpp (modified) (3 diffs)

src/Python/PythonScripting.cpp

@@ -39 +39 @@
 #include "CodePatterns/MemDebug.hpp"
 
-bool executePythonScript(const std::string &pythonfilename_string)
+bool executePythonScriptFile(const boost::filesystem::path &pythonfilename)
 {
-  boost::filesystem::path pythonfilename(pythonfilename_string);
   if (exists(pythonfilename)) {
     // parse in and execute the local and global config.py
@@ -61 +60 @@
       std::string pythonscript( std::istreambuf_iterator<char>(pythonfile),
           (std::istreambuf_iterator<char>()) );
-      std::string enveloped_script("print \"BEGIN of "+pythonfilename_string+":\"\n");
+      std::string enveloped_script("print \"BEGIN of "+pythonfilename.string()+":\"\n");
       enveloped_script += pythonscript;
-      enveloped_script += std::string("print \"END of "+pythonfilename_string+":\"\n");
+      enveloped_script += std::string("print \"END of "+pythonfilename.string()+":\"\n");
 
       boost::python::handle<> ignored(( PyRun_String( enveloped_script.c_str(),
@@ -78 +77 @@
   return false;
 }
+
+bool executePythonScript(const std::string &python_string, const std::string &python_scripttitle)
+{
+  try {
+    PyImport_AppendInittab( "pyMoleCuilder", &initpyMoleCuilder );
+
+    Py_Initialize();
+
+    boost::python::object main_module((
+        boost::python::handle<>(boost::python::borrowed(PyImport_AddModule("__main__")))));
+
+    boost::python::object main_namespace = main_module.attr("__dict__");
+
+    boost::python::object molecuilder_module( (boost::python::handle<>(PyImport_ImportModule("pyMoleCuilder"))) );
+    main_namespace["pyMoleCuilder"] = molecuilder_module;
+
+    std::string enveloped_script("print \"BEGIN of "+python_scripttitle+":\"\n");
+    enveloped_script += python_string+std::string("\n");
+    enveloped_script += std::string("print \"END of "+python_scripttitle+":\"\n");
+
+    boost::python::handle<> ignored(( PyRun_String( enveloped_script.c_str(),
+        Py_file_input,
+        main_namespace.ptr(),
+        main_namespace.ptr() ) ));
+
+  } catch( boost::python::error_already_set ) {
+    PyErr_Print();
+    return false;
+  }
+  return true;
+}