Compatibility with Python 3.12.

veluca93 · veluca93 · commit bb9e95f65434 · 2024-11-16T22:06:24.000+01:00
Inspired by ioi-2024@0f044fd
diff --git a/cms/io/web_service.py b/cms/io/web_service.py
@@ -21,6 +21,13 @@
 
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.wsgi as tornado_wsgi
 except ImportError:
diff --git a/cms/server/admin/handlers/base.py b/cms/server/admin/handlers/base.py
@@ -34,6 +34,13 @@
 from datetime import datetime, timedelta
 from functools import wraps
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/admin/handlers/contestannouncement.py b/cms/server/admin/handlers/contestannouncement.py
@@ -26,6 +26,13 @@
 
 """
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/admin/handlers/contestquestion.py b/cms/server/admin/handlers/contestquestion.py
@@ -27,6 +27,13 @@
 
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/admin/handlers/contestuser.py b/cms/server/admin/handlers/contestuser.py
@@ -31,6 +31,13 @@
 
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/admin/handlers/dataset.py b/cms/server/admin/handlers/dataset.py
@@ -32,6 +32,13 @@
 import re
 import zipfile
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/admin/handlers/task.py b/cms/server/admin/handlers/task.py
@@ -29,6 +29,13 @@
 import logging
 import traceback
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/base.py b/cms/server/contest/handlers/base.py
@@ -32,6 +32,13 @@
 import logging
 import traceback
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/communication.py b/cms/server/contest/handlers/communication.py
@@ -29,6 +29,13 @@
 
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/contest.py b/cms/server/contest/handlers/contest.py
@@ -32,6 +32,13 @@
 import ipaddress
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/main.py b/cms/server/contest/handlers/main.py
@@ -33,6 +33,13 @@
 import logging
 import re
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/task.py b/cms/server/contest/handlers/task.py
@@ -30,6 +30,13 @@
 
 import logging
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/tasksubmission.py b/cms/server/contest/handlers/tasksubmission.py
@@ -32,6 +32,13 @@
 import logging
 import re
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/contest/handlers/taskusertest.py b/cms/server/contest/handlers/taskusertest.py
@@ -31,6 +31,13 @@
 import logging
 import re
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     import tornado4.web as tornado_web
 except ImportError:
diff --git a/cms/server/util.py b/cms/server/util.py
@@ -30,6 +30,13 @@
 from functools import wraps
 from urllib.parse import quote, urlencode
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     from tornado4.web import RequestHandler
 except ImportError:
diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
@@ -20,7 +20,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import imp
 import logging
 import os
 import subprocess
@@ -145,10 +144,11 @@ def get_task(self, get_statement=True):
         task_cms_conf = None
         if os.path.exists(task_cms_conf_path):
             logger.info("Found additional CMS options for task %s.", name)
-            with open(task_cms_conf_path, 'rb') as f:
-                task_cms_conf = imp.load_module('cms_conf', f,
-                                                task_cms_conf_path,
-                                                ('.py', 'r', imp.PY_SOURCE))
+            import importlib.util
+            spec = importlib.util.spec_from_file_location(
+                'cms_conf', task_cms_conf_path)
+            task_cms_conf = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(task_cms_conf)
         if task_cms_conf is not None and hasattr(task_cms_conf, "general"):
             args.update(task_cms_conf.general)
 
diff --git a/cmstestsuite/unit_tests/grading/ParameterTypesTest.py b/cmstestsuite/unit_tests/grading/ParameterTypesTest.py
@@ -20,6 +20,13 @@
 
 import unittest
 
+import collections
+try:
+    collections.MutableMapping
+except:
+    # Monkey-patch: Tornado 4.5.3 does not work on Python 3.11 by default
+    collections.MutableMapping = collections.abc.MutableMapping
+
 try:
     from tornado4.web import MissingArgumentError
 except ImportError:
diff --git a/cmstestsuite/unit_tests/locale/locale_test.py b/cmstestsuite/unit_tests/locale/locale_test.py
diff --git a/requirements.txt b/requirements.txt
