Support Python 3.13 and 3.14

Author: Cito

.github/workflows/release-docs.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - name: Set up Python 3.12
+    - name: Set up Python 3.13
       uses: actions/setup-python@v6
       with:
-        python-version: "3.12"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/test-package.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        python-version: ['3.10', '3.11', '3.12', 'pypy-3.10', 'pypy-3.11']
+        python-version: ['3.10', '3.11', '3.12', '3.13', 'pypy-3.10', 'pypy-3.11']
 
     steps:
     - uses: actions/checkout@v5
@@ -23,11 +23,11 @@ jobs:
         python -m pip install --upgrade pip
         pip install .[tests]
     - name: Lint with flake8
-      if: matrix.python-version == '3.12'
+      if: matrix.python-version == '3.13'
       run: |
         flake8 webware --count --exit-zero --statistics
     - name: Lint with pylint
-      if: matrix.python-version == '3.12'
+      if: matrix.python-version == '3.13'
       run: |
         pylint webware
     - name: Run all unit tests

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "editor.rulers": [
+        79, 88
+    ]
+}

pyproject.toml

@@ -28,6 +28,8 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Operating System :: OS Independent",

tox.ini

@@ -1,27 +1,27 @@
 [tox]
-envlist = py3{10,11,12}, pypy3{10,11}, flake8, pylint, docs, manifest
+envlist = py3{10,11,12,13,14rc2}, pypy3{10,11}, flake8, pylint, docs, manifest
 
 [testenv:flake8]
-basepython = python3.12
+basepython = python3.13
 deps = flake8>=7,<8
 commands =
     flake8 webware
 
 [testenv:pylint]
-basepython = python3.12
+basepython = python3.13
 deps = pylint>=3,<4
 commands =
     pylint webware
 
 [testenv:docs]
-basepython = python3.12
+basepython = python3.13
 extras =
     docs
 commands =
     sphinx-build -b html -nEW docs docs/_build/html
 
 [testenv:manifest]
-basepython = python3.12
+basepython = python3.13
 deps = check-manifest>=0.50
 commands =
     check-manifest -v

webware/Admin/AppControl.py

@@ -24,11 +24,12 @@ def writeContent(self):
                 wr('<tr><td></td><td>')
                 for n in sorted(sys.modules):
                     m = sys.modules[n]
-                    if (not n.endswith('__init__') and not hasattr(m, '__path__')
+                    if (not n.endswith('__init__')
+                            and not hasattr(m, '__path__')
                             and not hasattr(m, '__orig_file__')):
                         # show only the easily reloadable modules
-                        wr(f'<input type="checkbox" name="reloads" value="{n}">'
-                           f' {n}<br>')
+                        wr(f'<input type="checkbox" name="reloads"'
+                           f' value="{n}"> {n}<br>')
                 wr('</td></tr>\n</table>\n</form>')
 
             case "Clear cache":

webware/Application.py

@@ -14,6 +14,7 @@
 """
 
 import atexit
+import importlib
 import os
 import signal
 import sys
@@ -295,12 +296,12 @@ def initSessions(self):
         moduleName = setting('SessionModule')
         className = moduleName.rpartition('.')[2]
         try:
-            exec(f'from {moduleName} import {className}')
-            cls = locals()[className]
+            module = importlib.import_module(moduleName)
+            cls = getattr(module, className)
             if not isinstance(cls, type):
                 raise ImportError
             self._sessionClass = cls
-        except ImportError:
+        except (ImportError, AttributeError):
             print(f"ERROR: Could not import Session class '{className}'"
                   f" from module '{moduleName}'")
             self._sessionClass = None
@@ -310,8 +311,8 @@ def initSessions(self):
             moduleName = f'Session{moduleName}Store'
         className = moduleName.rpartition('.')[2]
         try:
-            exec(f'from {moduleName} import {className}')
-            cls = locals()[className]
+            module = importlib.import_module(moduleName)
+            cls = getattr(module, className)
             if not isinstance(cls, type):
                 raise ImportError
             self._sessions = cls(self)

webware/MiscUtils/DBPool.py

@@ -128,6 +128,20 @@ def __init__(self, dbapi, maxconnections, *args, **kwargs):
         for _count in range(maxconnections):
             self.addConnection(dbapi.connect(*args, **kwargs))
 
+    def close(self):
+        """Close all connections in the pool."""
+        try:
+            queue = self._queue
+        except AttributeError:
+            connections = self._connections
+            while connections:
+                con = connections.pop()
+                con.close()
+        else:
+            while not queue.empty():
+                con = queue.get_nowait()
+                con.close()
+
     # The following functions are used with DB-API 2 modules
     # that do not have connection level threadsafety, like PyGreSQL.
     # However, the module must be threadsafe at the module level.

webware/MiscUtils/NamedValueAccess.py

@@ -77,7 +77,8 @@ def valueForKey(obj, key, default=NoDefault):
             underKey = '_' + key
             if not (method := getattr(cls, underKey, None) if cls else None):
                 if (attr := getattr(obj, key, NoDefault)) is NoDefault:
-                    if (attr := getattr(obj, underKey, NoDefault)) is NoDefault and cls is not None:
+                    if ((attr := getattr(obj, underKey, NoDefault))
+                            is NoDefault and cls is not None):
                         if getitem := getattr(cls, '__getitem__', None):
                             try:
                                 getitem(obj, key)

webware/MiscUtils/Tests/TestDBPool.py

@@ -6,12 +6,19 @@
 
 class TestDBPool(unittest.TestCase):
 
+    def setUp(self):
+        self.pool = DBPool(sqlite3, 10, database=':memory:')
+
+    def tearDown(self):
+        self.pool.close()
+
     def testDbPool(self):
-        pool = DBPool(sqlite3, 10, database=':memory:')
+        query = "select 1 union select 2 union select 3 order by 1"
+        result = [(1,), (2,), (3,)]
         for _count in range(15):
-            con = pool.connection()
+            con = self.pool.connection()
             cursor = con.cursor()
-            cursor.execute("select 1 union select 2 union select 3 order by 1")
+            cursor.execute(query)
             rows = cursor.fetchall()
-            self.assertEqual(rows, [(1,), (2,), (3,)])
+            self.assertEqual(rows, result)
             con.close()