Backport minor fixes from 3.1

Cito · Cito · commit 49125b8ba423 · 2025-09-07T15:04:09.000+02:00
diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v3
+    - uses: actions/checkout@v5
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v6
       with:
-        python-version: "3.11"
+        python-version: "3.12"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -26,7 +26,7 @@ jobs:
         make html
         touch _build/html/.nojekyll
     - name: Deploy docs to GitHub pages
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_branch: gh-pages
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -10,24 +10,24 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install .[tests] --use-pep517
     - name: Lint with flake8
-      if: matrix.python-version == '3.11'
+      if: matrix.python-version == '3.12'
       run: |
         flake8 webware setup.py --count --exit-zero --statistics
     - name: Lint with pylint
-      if: matrix.python-version == '3.11'
+      if: matrix.python-version == '3.12'
       run: |
         pylint webware
     - name: Run all unit tests
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ Sessions/
 Webware-for-Python-*
 
 .idea/
+.vscode/
 .tox/
 .venv/
 .venv.*/
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Webware for Python 3'
-copyright = '1999-2023, Christoph Zwerschke et al'
+copyright = '1999-2025, Christoph Zwerschke et al'
 author = 'Christoph Zwerschke et al.'
 
 # The short X.Y version
diff --git a/docs/install.rst b/docs/install.rst
@@ -53,12 +53,12 @@ When installing Webware for Python 3, the following "extras" can optionally be i
 
 * "dev": extras for developing Webware applications
 * "examples": extras for running all Webware examples
-* "test": extras needed to test all functions of Webware
+* "tests": extras needed to test all functions of Webware
 * "docs": extras needed to build this documentation
 
-On your development machine, we recommend installing the full "test" environment which also includes the other two environments. To do that, you need to specify the "Extras" name in square brackets when installing Webware for Python 3::
+On your development machine, we recommend installing the full "tests" environment which also includes the other two environments. To do that, you need to specify the "Extras" name in square brackets when installing Webware for Python 3::
 
-    pip install "Webware-for-Python[dev]>=3"
+    pip install "Webware-for-Python[tests]>=3"
 
 
 Installation from Source
diff --git a/tox.ini b/tox.ini
@@ -2,26 +2,26 @@
 envlist = py{36,37,38,39,310,311,312}, pypy3, flake8, pylint, docs, manifest
 
 [testenv:flake8]
-basepython = python3.11
+basepython = python3.12
 deps = flake8>=6,<7
 commands =
     flake8 webware setup.py
 
 [testenv:pylint]
-basepython = python3.11
+basepython = python3.12
 deps = pylint>=2.16,<3
 commands =
     pylint webware
 
 [testenv:docs]
-basepython = python3.11
+basepython = python3.12
 extras =
     docs
 commands =
     sphinx-build -b html -nEW docs docs/_build/html
 
 [testenv:manifest]
-basepython = python3.11
+basepython = python3.12
 deps = check-manifest>=0.49
 commands =
     check-manifest -v
diff --git a/webware/Application.py b/webware/Application.py
@@ -14,6 +14,7 @@
 """
 
 import atexit
+import importlib
 import os
 import signal
 import sys
@@ -295,27 +296,27 @@ 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
+                raise ImportError(f'{cls!r} is not a type')
             self._sessionClass = cls
-        except ImportError:
+        except (ImportError, AttributeError) as err:
             print(f"ERROR: Could not import Session class '{className}'"
-                  f" from module '{moduleName}'")
+                  f" from module '{moduleName}':\n{err}")
             self._sessionClass = None
         moduleName = setting('SessionStore')
         if moduleName in (
                 'Dynamic', 'File', 'Memcached', 'Memory', 'Redis', 'Shelve'):
             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
+                raise ImportError(f'{cls!r} is not a type')
             self._sessions = cls(self)
-        except ImportError as err:
+        except (ImportError, AttributeError) as err:
             print(f"ERROR: Could not import SessionStore class '{className}'"
                   f" from module '{moduleName}':\n{err}")
             self._sessions = None
diff --git a/webware/Examples/PushServlet.py b/webware/Examples/PushServlet.py
@@ -57,7 +57,7 @@ def pushHTML(self, count):
         if count:
             wr('<h3>This page has been replaced'
                f' <strong style="color:#339">{count:d}</strong>'
-               f" time{'' if count ==1 else 's'}.</h3>")
+               f" time{'' if count == 1 else 's'}.</h3>")
             if count == 3:
                 wr('<p>Stopped pushing contents.</p>')
             else:
diff --git a/webware/MiscUtils/DBPool.py b/webware/MiscUtils/DBPool.py
@@ -152,6 +152,20 @@ def _unthreadsafeReturnConnection(self, con):
         """
         self._unthreadsafeAddConnection(con)
 
+    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 are threadsafe at the connection level, like psycopg.
     # Note: In this case, connections are shared between threads.
diff --git a/webware/MiscUtils/DataTable.py b/webware/MiscUtils/DataTable.py
@@ -791,8 +791,7 @@ def __repr__(self):
         return repr(self._values)
 
     def __iter__(self):
-        for value in self._values:
-            yield value
+        yield from self._values
 
     def get(self, key, default=None):
         index = self._nameToIndexMap.get(key)
@@ -801,7 +800,7 @@ def get(self, key, default=None):
         return self._values[index]
 
     def has_key(self, key):
-        warn("has_key is deprecated, please us 'in' instead.",
+        warn("has_key is deprecated, use 'in' instead.",
              DeprecationWarning, stacklevel=2)
         return key in self
 
diff --git a/webware/MiscUtils/PickleCache.py b/webware/MiscUtils/PickleCache.py
@@ -47,10 +47,7 @@
 import sys
 from time import sleep
 from pprint import pprint
-try:
-    from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
-except ImportError:
-    from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
+from pickle import load, dump, HIGHEST_PROTOCOL as maxPickleProtocol
 
 verbose = False
 
diff --git a/webware/MiscUtils/PickleRPC.py b/webware/MiscUtils/PickleRPC.py
@@ -371,11 +371,11 @@ def parse_response_gzip(self, f):
 class SafeTransport(Transport):
     """Handle an HTTPS transaction to a Pickle-RPC server."""
 
-    def make_connection(self, host, port=None, key_file=None, cert_file=None):
+    def make_connection(self, host, port=None, **kwargs):
         """Create an HTTPS connection object from a host descriptor."""
         try:
             from http.client import HTTPSConnection
         except ImportError as e:
             raise NotImplementedError(
                 "Your version of http.client doesn't support HTTPS") from e
-        return HTTPSConnection(host, port, key_file, cert_file)
+        return HTTPSConnection(host, port, **kwargs)
diff --git a/webware/MiscUtils/Tests/TestDBPool.py b/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()
diff --git a/webware/PickleRPCServlet.py b/webware/PickleRPCServlet.py
@@ -4,10 +4,7 @@
 import traceback
 from time import time
 
-try:
-    from pickle import dumps, PickleError
-except ImportError:
-    from pickle import dumps, PickleError
+from pickle import dumps, PickleError
 
 try:
     import zlib
diff --git a/webware/SessionStore.py b/webware/SessionStore.py
@@ -120,7 +120,7 @@ def __iter__(self):
 
     def has_key(self, key):
         """Check whether the session store has a given key."""
-        warn("has_key is deprecated, please us 'in' instead.",
+        warn("has_key is deprecated, use 'in' instead.",
              DeprecationWarning, stacklevel=2)
         return key in self
 
diff --git a/webware/Tests/TestEndToEnd/AppTest.py b/webware/Tests/TestEndToEnd/AppTest.py
@@ -1,6 +1,7 @@
 """Test Webware Application via its WSGI interface"""
 
 import sys
+import traceback
 
 from io import StringIO
 from os import chdir, getcwd
@@ -31,7 +32,8 @@ def setUpClass(cls):
             cls.app = app
             cls.testApp = TestApp(app)
         except Exception as e:
-            error = str(e) or 'Could not create application'
+            error = (f"ERROR: {type(e).__name__}: {e}\n"
+                     f"Full traceback:\n{traceback.format_exc()}")
         else:
             error = None
         finally:
@@ -42,15 +44,15 @@ def setUpClass(cls):
                 output = ''
         if error:
             raise RuntimeError(
-                'Error setting up application:\n' + error +
-                '\nOutput was:\n' + output)
+                'Error setting up application:\n'
+                f'{error}\nOutput was:\n{output}')
         if cls.catchOutput and not (
                 output.startswith('Webware for Python')
                 and 'Running in development mode' in output
                 and 'Loading context' in output):
             raise AssertionError(
                 'Application was not properly started.'
-                ' Output was:\n' + output)
+                f' Output was:\n{output}')
 
     @classmethod
     def tearDownClass(cls):
@@ -68,8 +70,8 @@ def tearDownClass(cls):
                 'Application is shutting down...\n'
                 'Application has been successfully shut down.'):
             raise AssertionError(
-                'Application was not properly shut down. Output was:\n'
-                + output)
+                'Application was not properly shut down.'
+                f' Output was:\n{output}')
 
     def setUp(self):
         self.output = ''
diff --git a/webware/Tests/TestEndToEnd/TestMakeApp.py b/webware/Tests/TestEndToEnd/TestMakeApp.py
@@ -39,7 +39,7 @@ def testMakeHelp(self):
             expected.append('[-u USER] [-g GROUP]')
         expected.append('WORK_DIR')
         expected = ' '.join(expected)
-        self.assertTrue(output.startswith(expected))
+        self.assertTrue(output.startswith(expected), output)
 
     def testMakeNewApp(self):
         output = self.runMake(['MyApp'])
diff --git a/webware/URLParser.py b/webware/URLParser.py
@@ -641,18 +641,16 @@ def parseInit(self, trans, requestPath):
                 restPath = ''
             if nextPart in mod.urlRedirect:
                 redirectTo = mod.urlRedirect[nextPart]
-                redirectPath = restPath
             elif '' in mod.urlRedirect:
                 redirectTo = mod.urlRedirect['']
-                redirectPath = restPath
             else:
                 redirectTo = None
             if redirectTo:
                 if isinstance(redirectTo, str):
                     fp = FileParser(os.path.join(self._path, redirectTo))
                 else:
                     fp = redirectTo
-                return fp.parse(trans, redirectPath)
+                return fp.parse(trans, restPath)
 
         if 'SubParser' not in seen and hasattr(mod, 'SubParser'):
             seen.add('SubParser')
diff --git a/webware/UnknownFileTypeServlet.py b/webware/UnknownFileTypeServlet.py
@@ -198,7 +198,7 @@ def serveContent(self, trans):
             if debug:
                 print('>> UnknownFileType.serveContent()')
                 print('>> filename =', filename)
-                print('>> size=', fileSize)
+                print('>> size =', fileSize)
             fileDict = fileCache.get(filename)
             if fileDict is not None and mtime != fileDict['mtime']:
                 # Cache is out of date; clear it.
diff --git a/webware/__init__.py b/webware/__init__.py
@@ -1,5 +1,9 @@
 """Webware for Python"""
 
+from .Properties import version as versionTuple
+
+__version__ = '.'.join(map(str, versionTuple))
+
 
 def addToSearchPath():
     """Add the Webware package to the search path for Python modules."""
