Changeset b0060a for src/Python

Timestamp:

Apr 23, 2021, 8:31:24 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

3f5b0a

Parents:

ba49d8

git-author:

Frederik Heber <frederik.heber@…> (08/03/20 21:55:45)

git-committer:

Frederik Heber <frederik.heber@…> (04/23/21 20:31:24)

Message:

Making test code python2&3 compatible.

File:

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

src/Python/PythonScripting.cpp

@@ -53 +53 @@
 bool executePythonScript(const std::string &python_string, const std::string &python_scripttitle)
 {
+  std::stringstream input(python_string);
+  std::stringstream buffer_import;
+  std::stringstream buffer_else;
+  // move all lines with "import" to the beginning
+  std::string current_line;
+  while(std::getline(input,current_line,'\n')){
+    if (current_line.find("import ") != std::string::npos)
+      buffer_import << current_line << std::endl;
+    else
+      buffer_else << current_line << std::endl;
+  }
+  std::string pythonscript_import( std::istreambuf_iterator<char>(buffer_import),
+      (std::istreambuf_iterator<char>()) );
+  std::string pythonscript_else( std::istreambuf_iterator<char>(buffer_else),
+      (std::istreambuf_iterator<char>()) );
+
   try {
 #ifdef HAVE_PYTHON2
@@ -67 +83 @@
     boost::python::object main_namespace = main_module.attr("__dict__");
 
+    boost::python::handle<> imported(( PyRun_String( pythonscript_import.c_str(),
+        Py_file_input,
+        main_namespace.ptr(),
+        main_namespace.ptr() ) ));
+
     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 += pythonscript_else+std::string("\n");
     enveloped_script += std::string("print(\"END of "+python_scripttitle+":\")\n");