Python 3.10 support

configure.in

@@ -167,9 +167,9 @@ fi
 
 # find out python version
 AC_MSG_CHECKING(Python version)
-PyVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version[:3])'`]
-PyMAJVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version[:1])'`]
-PyMINVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version.split(".")[1])'`]
+PyVERSION=`$PYTHON_BIN -c ['import sys; print('{}.{}'.format(*sys.version_info))'`]
+PyMAJVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version_info.major)'`]
+PyMINVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version_info.minor)'`]
 AC_MSG_RESULT($PyVERSION)
 
 # make sure Python version is >= 2.6 for 2 and >= 3.3 for 3

lib/python/mod_python/publisher.py

@@ -51,8 +51,8 @@ def _callable(obj):
     if PY2:
         return callable(obj)
     else:
-        return (isinstance(obj, collections.Callable) or
-                (hasattr(obj, "__call__") and isinstance(obj.__call__, collections.Callable)))
+        return (isinstance(obj, collections.abc.Callable) or
+                (hasattr(obj, "__call__") and isinstance(obj.__call__, collections.abc.Callable)))
 
 ####################### The published page cache ##############################
 

lib/python/mod_python/util.py

@@ -368,12 +368,12 @@ def __init__(self, req, keep_blank_values=0, strict_parsing=0, file_callback=Non
             filename = None
             if b"filename" in disp_options:
                 filename = disp_options[b"filename"]
-                if file_callback and isinstance(file_callback, collections.Callable):
+                if file_callback and isinstance(file_callback, collections.abc.Callable):
                     file = file_callback(filename)
                 else:
                     file = tempfile.TemporaryFile("w+b")
             else:
-                if field_callback and isinstance(field_callback, collections.Callable):
+                if field_callback and isinstance(field_callback, collections.abc.Callable):
                     file = field_callback()
                 else:
                     file = BytesIO()

src/connobject.c

@@ -232,7 +232,7 @@ static PyObject * conn_readline(connobject *self, PyObject *args)
 static PyObject * conn_write(connobject *self, PyObject *args)
 {
     char *buff;
-    int len;
+    Py_ssize_t len;
     apr_bucket_brigade *bb;
     apr_bucket *b;
     PyObject *s;

src/filterobject.c

@@ -315,7 +315,7 @@ static PyObject *filter_write(filterobject *self, PyObject *args)
 {
 
     char *buff;
-    int len;
+    Py_ssize_t len;
     apr_bucket *b;
     PyObject *s;
     conn_rec *c = self->request_obj->request_rec->connection;

src/include/mod_python.h

@@ -43,6 +43,7 @@
  */
 
 /* Python headers */
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
 

src/include/mod_python.h.in

@@ -43,6 +43,7 @@
  */
 
 /* Python headers */
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
 

src/requestobject.c

@@ -1576,7 +1576,7 @@ static PyObject * req_update_mtime(requestobject *self, PyObject *args)
 
 static PyObject * req_write(requestobject *self, PyObject *args)
 {
-    int len;
+    Py_ssize_t len;
     int rc;
     char *buff;
     int flush=1;