Changeset 1ca493a for src/Python

Timestamp:

Jun 25, 2020, 8:26:37 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

b56827

Parents:

912a6f

git-author:

Frederik Heber <frederik.heber@…> (04/16/19 23:09:54)

git-committer:

Frederik Heber <frederik.heber@…> (06/25/20 20:26:37)

Message:

Allowing python3 usage.

• Init function name changes on python2/3.
• added test and AC_DEFINEs to configure.ac.
• PythonScripting branches on these preprocessor defines.
• removed ax_python.m4.
• FIX: boost.m4 overwrites BOOST_PYTHON_LIBS pulled from python-config which caused the issues with ax_python.m4 and boost.m4 checking for different python versions. Added BOOST_PYTHON_LIB which contains the python libs needed.

Location:

src/Python

Files:

• Makefile.am (modified) (1 diff)
• PythonScripting.cpp (modified) (2 diffs)

src/Python/Makefile.am

@@ -19 +19 @@
 noinst_LTLIBRARIES += libMolecuilderPython.la
 libMolecuilderPython_la_includedir = $(includedir)/MoleCuilder/
-libMolecuilderPython_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
+libMolecuilderPython_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_PYTHON_CPPFLAGS)
 libMolecuilderPython_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PYTHON_LDFLAGS) 
 libMolecuilderPython_la_LIBADD = \
         $(BOOST_PYTHON_LIBS) \
-        ${CodePatterns_LIBS} \
-        -l$(PYTHON_LIB)
+        $(BOOST_PYTHON_LIB) \
+        ${CodePatterns_LIBS}
 
 nobase_libMolecuilderPython_la_include_HEADERS = ${PYTHONHEADER}

src/Python/PythonScripting.cpp

@@ -54 +54 @@
 {
   try {
+#ifdef HAVE_PYTHON2
     PyImport_AppendInittab( "pyMoleCuilder", &initpyMoleCuilder );
+#else
+    PyImport_AppendInittab( "pyMoleCuilder", &PyInit_pyMoleCuilder );
+#endif
 
     Py_Initialize();
@@ -66 +70 @@
     main_namespace["pyMoleCuilder"] = molecuilder_module;
 
-    std::string enveloped_script("print \"BEGIN of "+python_scripttitle+":\"\n");
+    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");
+    enveloped_script += std::string("print(\"END of "+python_scripttitle+":\")\n");
 
     boost::python::handle<> ignored(( PyRun_String( enveloped_script.c_str(),