Fix and add tests for module state

Author: o01eg

include/boost/python/module_init.hpp

@@ -170,7 +170,7 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
 #     define _BOOST_PYTHON_MODULE_WITH_STATE_INIT(name, StateType, ...) \
   int BOOST_PP_CAT(exec_module_,name)(PyObject* mod) \
   { \
-    return boost::python::detail::exec_module( \
+    return boost::python::detail::exec_module_with_state( \
         mod, reinterpret_cast<void(*)(void*)>(BOOST_PP_CAT(init_module_, name)) ); \
   } \
   extern "C" BOOST_SYMBOL_EXPORT PyObject* BOOST_PP_CAT(PyInit_, name)()  \
@@ -244,7 +244,7 @@ BOOST_PYTHON_DECL PyObject* init_module(char const* name, void(*)());
 #     define _BOOST_PYTHON_MODULE_WITH_STATE_INIT(name, StateType) \
   int BOOST_PP_CAT(exec_module_,name)(PyObject* mod) \
   { \
-    return boost::python::detail::exec_module( \
+    return boost::python::detail::exec_module_with_state( \
         mod, reinterpret_cast<void(*)(void*)>(BOOST_PP_CAT(init_module_, name)) ); \
   } \
   extern "C" BOOST_SYMBOL_EXPORT PyObject* BOOST_PP_CAT(PyInit_, name)()  \

test/fabscript

@@ -180,5 +180,7 @@ tests.append(extension_test("module_multi_phase",
                             condition=python_version_major > 3 or (python_version_major == 3 and python_version_minor >= 5)))
 tests.append(extension_test("module_multi_phase_nogil",
                             condition=python_version_major > 3 or (python_version_major == 3 and python_version_minor >= 5)))
+tests.append(extension_test("module_multi_phase_state",
+                            condition=python_version_major > 3 or (python_version_major == 3 and python_version_minor >= 5)))
 
 default = report('report', tests, fail_on_failures=True)

test/module_multi_phase_state.cpp

@@ -0,0 +1,30 @@
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/python/def.hpp>
+#include <boost/python/import.hpp>
+#include <boost/python/module.hpp>
+
+using namespace boost::python;
+
+struct TestState
+{
+    int x;
+};
+
+int get_state_x() {
+    TestState* state = reinterpret_cast<TestState*>(PyModule_GetState(import("module_multi_phase_state_ext").ptr()));
+    if (state != nullptr) {
+        return state->x;
+    }
+    return -1;
+}
+
+BOOST_PYTHON_MODULE_WITH_STATE(module_multi_phase_state_ext, TestState)
+{
+    state->x = 42;
+    def("x", get_state_x);
+}
+
+#include "module_tail.cpp"

test/module_multi_phase_state.py

@@ -0,0 +1,23 @@
+# Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+"""
+>>> import module_multi_phase_state_ext
+>>> module_multi_phase_state_ext.x()
+42
+"""
+
+def run(args = None):
+    import sys
+    import doctest
+
+    if args is not None:
+        sys.argv = args
+    return doctest.testmod(sys.modules.get(__name__))
+
+if __name__ == '__main__':
+    print("running...")
+    import sys
+    status = run()[0]
+    if (status == 0): print("Done.")
+    sys.exit(status)