Merge pull request #145 from saurik/master

get tests working on Python 3.13 and 3.14

Author: grisha

lib/python/mod_python/publisher.py

@@ -255,8 +255,16 @@ def lookup(name):
                 if name in names:
                     i = list(names).index(name)
             if i is not None:
-                if PY2 or sys.hexversion >= 0x030b0000: # 3.12.0
-                    return (1, func_code.co_consts[i+1])
+                # Python 3.11 moved qualified name into code object
+                # https://github.com/python/cpython/pull/26941
+                # commit 2f180ce2cb6e6a7e3c517495e0f4873d6aaf5f2f
+                if PY2 or sys.hexversion >= 0x030b0000:
+                    # Python 3.14 added CO_HAS_DOCSTRING (0x4000000)
+                    # https://github.com/python/cpython/issues/126072
+                    # https://github.com/python/cpython/pull/126101
+                    # commit 35df4eb959b3923c08aaaeff728c5ed1706f31cf
+                    offset = 1 if sys.hexversion < 0x030e0000 or (func_code.co_flags & 0x4000000) != 0 else 0
+                    return (1, func_code.co_consts[offset+i])
                 else:
                     return (1, func_code.co_consts[1+i*2])
 

src/_apachemodule.c

@@ -852,13 +852,6 @@ PyObject *_apache_module_init()
     m = Py_InitModule("_apache", _apache_module_methods);
 #else
     m = PyModule_Create(&_apache_moduledef);
-    PyObject *name = PyUnicode_FromString("_apache");
-
-    _PyImport_FixupExtensionObject(m, name, name
-#if PY_MINOR_VERSION >= 7
-                   ,PyImport_GetModuleDict()
-#endif
-                   );
 #endif
     d = PyModule_GetDict(m);
     Mp_ServerReturn = PyErr_NewException("_apache.SERVER_RETURN", NULL, NULL);

src/include/_apachemodule.h

@@ -29,6 +29,5 @@
  */
 
 PyObject *get_ServerReturn(void);
-PyMODINIT_FUNC init_apache(void);
 
 #endif /* !Mp_APACHEMODULE_H */

src/mod_python.c

@@ -69,12 +69,6 @@ static PyObject * make_obcallback(const char *name)
     PyObject *m = NULL;
     PyObject *obCallBack = NULL;
 
-    /* This makes _apache appear imported, and subsequent
-     * >>> import _apache
-     * will not give an error.
-     */
-    _apache_module_init();
-
     /* Now execute the equivalent of
      * >>> import <module>
      * >>> <initstring>
@@ -787,6 +781,14 @@ static int python_init(apr_pool_t *p, apr_pool_t *ptemp,
         Py_NoSiteFlag = 1;
 #endif
 
+#if PY_MAJOR_VERSION == 2
+        PyMODINIT_FUNC init_apache(void);
+        PyImport_AppendInittab("_apache", &init_apache);
+#else
+        PyMODINIT_FUNC PyInit_apache(void);
+        PyImport_AppendInittab("_apache", &PyInit_apache);
+#endif
+
         Py_Initialize();
 
 #if PY_MAJOR_VERSION == 2 && \
@@ -2641,7 +2643,7 @@ static void PythonChildInitHandler(apr_pool_t *p, server_rec *s)
 
 #if PY_VERSION_HEX < 0x03070000
     PyOS_AfterFork();
-#else
+#elif PY_VERSION_HEX < 0x030D0000
     PyOS_AfterFork_Child();
 #endif