Support Python 3.13 and minor clean-up

Author: Cito

.github/workflows/publish_on_pypi.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "3.12"
 
     - name: Install build tool
       run: python -m pip install build --user

.github/workflows/test_with_tox.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4
@@ -21,5 +21,5 @@ jobs:
 
       - run: tox -e py
 
-      - if: matrix.python == 3.11
+      - if: matrix.python == 3.12
         run: TOXENV=ruff,manifest,docs,spell tox

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Christoph Zwerschke
+Copyright (c) 2025 Christoph Zwerschke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -7,7 +7,7 @@ to a database that can be used in all kinds of multi-threaded environments.
 The suite supports DB-API 2 compliant database interfaces
 and the classic PyGreSQL interface.
 
-The current version 3.1.0 of DBUtils supports Python versions 3.7 to 3.12.
+The current version 3.1.1 of DBUtils supports Python versions 3.7 to 3.13.
 
 **Please have a look at the [changelog](https://webwareforpython.github.io/DBUtils/changelog.html), because there were some breaking changes in version 2.0.**
 

dbutils/__init__.py

@@ -1,8 +1,5 @@
 """The DBUtils main package."""
 
-__all__ = [
-    '__version__',
-    'simple_pooled_pg', 'steady_pg', 'pooled_pg', 'persistent_pg',
-    'simple_pooled_db', 'steady_db', 'pooled_db', 'persistent_db']
+__all__ = ["__version__"]
 
-__version__ = '3.1.0'
+__version__ = "3.1.1"

dbutils/persistent_db.py

@@ -123,6 +123,8 @@
     # Fall back to the default version of threading.local.
     from threading import local
 
+__all__ = ['PersistentDB', 'PersistentDBError', 'NotSupportedError']
+
 
 class PersistentDBError(Exception):
     """General PersistentDB error."""

dbutils/persistent_pg.py

@@ -113,6 +113,8 @@
     # Fall back to the default version of threading.local.
     from threading import local
 
+__all__ = ['PersistentPg']
+
 
 class PersistentPg:
     """Generator for persistent classic PyGreSQL connections.

dbutils/pooled_db.py

@@ -153,6 +153,13 @@
 from . import __version__
 from .steady_db import connect
 
+__all__ = [
+    'PooledDB', 'PooledDedicatedDBConnection',
+    'SharedDBConnection', 'PooledSharedDBConnection',
+    'PooledDBError', 'InvalidConnectionError',
+    'NotSupportedError', 'TooManyConnectionsError',
+]
+
 
 class PooledDBError(Exception):
     """General PooledDB error."""

dbutils/pooled_pg.py

@@ -118,6 +118,12 @@
 from . import __version__
 from .steady_pg import SteadyPgConnection
 
+__all__ = [
+    'PooledPg', 'PooledPgConnection',
+    'PooledPgError', 'InvalidConnectionError', 'TooManyConnectionsError',
+    'RESET_ALWAYS_ROLLBACK', 'RESET_COMPLETELY',
+]
+
 # constants for "reset" parameter
 RESET_ALWAYS_ROLLBACK = 1
 RESET_COMPLETELY = 2

dbutils/simple_pooled_db.py

@@ -74,6 +74,10 @@
 
 from . import __version__
 
+__all__ = [
+    'PooledDB', 'PooledDBConnection', 'PooledDBError', 'NotSupportedError',
+]
+
 
 class PooledDBError(Exception):
     """General PooledDB error."""

dbutils/simple_pooled_pg.py

@@ -71,6 +71,8 @@
 
 from . import __version__
 
+__all__ = ['PooledPg', 'PooledPgConnection']
+
 
 class PooledPgConnection:
     """A proxy class for pooled PostgreSQL connections.

docs/changelog.html

@@ -12,6 +12,14 @@
 <h1 class="title">Changelog for DBUtils</h1>
 
 <section id="section-1">
+<h2>3.1.1</h2>
+<p>DBUtils 3.1.1 was released on June 4, 2025.</p>
+<p>Changes:</p>
+<ul class="simple">
+<li><p>Support Python version 3.13.</p></li>
+</ul>
+</section>
+<section id="section-2">
 <h2>3.1.0</h2>
 <p>DBUtils 3.1.0 was released on March 17, 2024.</p>
 <p>Changes:</p>
@@ -20,7 +28,7 @@ <h2>3.1.0</h2>
 <li><p>Various small internal improvements and modernizations.</p></li>
 </ul>
 </section>
-<section id="section-2">
+<section id="section-3">
 <h2>3.0.3</h2>
 <p>DBUtils 3.0.3 was released on April 27, 2023.</p>
 <p>Changes:</p>
@@ -30,19 +38,19 @@ <h2>3.0.3</h2>
 <li><p>Minor fixes and section an advanced usage in docs.</p></li>
 </ul>
 </section>
-<section id="section-3">
+<section id="section-4">
 <h2>3.0.2</h2>
 <p>DBUtils 3.0.2 was released on January 14, 2022.</p>
 <p>The optional iterator protocol on cursors is now supported.</p>
 </section>
-<section id="section-4">
+<section id="section-5">
 <h2>3.0.1</h2>
 <p>DBUtils 3.0.1 was released on December 22, 2021.</p>
 <p>It includes <span class="docutils literal">InterfaceError</span> to the default list of exceptions
 for which the connection failover mechanism is applied.
 You can override this with the <span class="docutils literal">failures</span> parameter.</p>
 </section>
-<section id="section-5">
+<section id="section-6">
 <h2>3.0.0</h2>
 <p>DBUtils 3.0.0 was released on November 26, 2021.</p>
 <p>It is intended to be used with Python versions 3.6 to 3.10.</p>
@@ -51,31 +59,31 @@ <h2>3.0.0</h2>
 <li><p>Cease support for Python 2 and 3.5, minor optimizations.</p></li>
 </ul>
 </section>
-<section id="section-6">
+<section id="section-7">
 <h2>2.0.3</h2>
 <p>DBUtils 2.0.3 was released on November 26, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Support Python version 3.10.</p></li>
 </ul>
 </section>
-<section id="section-7">
+<section id="section-8">
 <h2>2.0.2</h2>
 <p>DBUtils 2.0.2 was released on June 8, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Allow using context managers for pooled connections.</p></li>
 </ul>
 </section>
-<section id="section-8">
+<section id="section-9">
 <h2>2.0.1</h2>
 <p>DBUtils 2.0.1 was released on April 8, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Avoid &quot;name Exception is not defined&quot; when exiting.</p></li>
 </ul>
 </section>
-<section id="section-9">
+<section id="section-10">
 <h2>2.0</h2>
 <p>DBUtils 2.0 was released on September 26, 2020.</p>
 <p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -91,7 +99,7 @@ <h2>2.0</h2>
 <li><p>This changelog has been compiled from the former release notes.</p></li>
 </ul>
 </section>
-<section id="section-10">
+<section id="section-11">
 <h2>1.4</h2>
 <p>DBUtils 1.4 was released on September 26, 2020.</p>
 <p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -102,7 +110,7 @@ <h2>1.4</h2>
 inside a transaction.</p></li>
 </ul>
 </section>
-<section id="section-11">
+<section id="section-12">
 <h2>1.3</h2>
 <p>DBUtils 1.3 was released on March 3, 2018.</p>
 <p>It is intended to be used with Python versions 2.6, 2.7 and 3.4 to 3.7.</p>
@@ -111,12 +119,12 @@ <h2>1.3</h2>
 <li><p>This version now supports context handlers for connections and cursors.</p></li>
 </ul>
 </section>
-<section id="section-12">
+<section id="section-13">
 <h2>1.2</h2>
 <p>DBUtils 1.2 was released on February 5, 2017.</p>
 <p>It is intended to be used with Python versions 2.6, 2.7 and 3.0 to 3.6.</p>
 </section>
-<section id="section-13">
+<section id="section-14">
 <h2>1.1.1</h2>
 <p>DBUtils 1.1.1 was released on February 4, 2017.</p>
 <p>It is intended to be used with Python versions 2.3 to 2.7.</p>
@@ -130,7 +138,7 @@ <h2>1.1.1</h2>
 <li><p>Fixed a problem when running under Jython (reported by Vitaly Kruglikov).</p></li>
 </ul>
 </section>
-<section id="section-14">
+<section id="section-15">
 <h2>1.1</h2>
 <p>DBUtils 1.1 was released on August 14, 2011.</p>
 <p>Improvements:</p>
@@ -159,7 +167,7 @@ <h2>1.1</h2>
 <li><p>Fixed some minor issues with the <span class="docutils literal">DBUtilsExample</span> for Webware.</p></li>
 </ul>
 </section>
-<section id="section-15">
+<section id="section-16">
 <h2>1.0</h2>
 <p>DBUtils 1.0 was released on November 29, 2008.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.6.</p>
@@ -192,7 +200,7 @@ <h2>1.0</h2>
 the MySQLdb module (problem reported by Gregory Pinero).</p></li>
 </ul>
 </section>
-<section id="section-16">
+<section id="section-17">
 <h2>0.9.4</h2>
 <p>DBUtils 0.9.4 was released on July 7, 2007.</p>
 <p>This release fixes a problem in the destructor code and has been supplemented
@@ -201,7 +209,7 @@ <h2>0.9.4</h2>
 in the last release, since you can now pass custom creator functions
 for database connections instead of DB-API 2 modules.</p>
 </section>
-<section id="section-17">
+<section id="section-18">
 <h2>0.9.3</h2>
 <p>DBUtils 0.9.3 was released on May 21, 2007.</p>
 <p>Changes:</p>
@@ -216,7 +224,7 @@ <h2>0.9.3</h2>
 Added Chinese translation of the User's Guide, kindly contributed by gashero.</p></li>
 </ul>
 </section>
-<section id="section-18">
+<section id="section-19">
 <h2>0.9.2</h2>
 <p>DBUtils 0.9.2 was released on September 22, 2006.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.5.</p>
@@ -226,7 +234,7 @@ <h2>0.9.2</h2>
 storage engine. Accordingly, renamed <span class="docutils literal">SolidPg</span> to <span class="docutils literal">SteadyPg</span>.</p></li>
 </ul>
 </section>
-<section id="section-19">
+<section id="section-20">
 <h2>0.9.1</h2>
 <p>DBUtils 0.9.1 was released on May 8, 2006.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.4.</p>
@@ -240,7 +248,7 @@ <h2>0.9.1</h2>
 <li><p>Improved the documentation and added a User's Guide.</p></li>
 </ul>
 </section>
-<section id="section-20">
+<section id="section-21">
 <h2>0.8.1 - 2005-09-13</h2>
 <p>DBUtils 0.8.1 was released on September 13, 2005.</p>
 <p>It is intended to be used with Python versions 2.0 to 2.4.</p>

docs/changelog.rst

@@ -1,6 +1,15 @@
 Changelog for DBUtils
 +++++++++++++++++++++
 
+3.1.1
+=====
+
+DBUtils 3.1.1 was released on June 4, 2025.
+
+Changes:
+
+* Support Python version 3.13.
+
 3.1.0
 =====
 
@@ -11,7 +20,6 @@ Changes:
 * Support Python version 3.12, cease support for Python 3.6.
 * Various small internal improvements and modernizations.
 
-
 3.0.3
 =====
 

docs/main.de.html

@@ -12,7 +12,7 @@
 <h1 class="title">Benutzeranleitung für DBUtils</h1>
 <dl class="docinfo simple">
 <dt class="version">Version<span class="colon">:</span></dt>
-<dd class="version">3.1.0</dd>
+<dd class="version">3.1.1</dd>
 <dt class="translations">Translations<span class="colon">:</span></dt>
 <dd class="translations"><p><a class="reference external" href="main.html">English</a> | German</p>
 </dd>
@@ -137,7 +137,7 @@ <h3>Installation</h3>
 </section>
 <section id="anforderungen">
 <h2>Anforderungen</h2>
-<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 3.7 bis 3.12.</p>
+<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 3.7 bis 3.3.</p>
 <p>Die Module in der Variante für klassisches PyGreSQL benötigen <a class="reference external" href="https://www.pygresql.org/">PyGreSQL</a>
 Version 4.0 oder höher, während die Module in der allgemeinen Variante
 für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul zusammenarbeiten,
@@ -542,7 +542,7 @@ <h2>Autoren</h2>
 </section>
 <section id="copyright-und-lizenz">
 <h2>Copyright und Lizenz</h2>
-<p>Copyright © 2005-2024 Christoph Zwerschke.
+<p>Copyright © 2005-2025 Christoph Zwerschke.
 Alle Rechte vorbehalten.</p>
 <p>DBUtils ist freie und quelloffene Software,
 lizenziert unter der <a class="reference external" href="https://opensource.org/licenses/MIT">MIT-Lizenz</a>.</p>

docs/main.de.rst

@@ -1,7 +1,7 @@
 Benutzeranleitung für DBUtils
 +++++++++++++++++++++++++++++
 
-:Version: 3.1.0
+:Version: 3.1.1
 :Translations: English_ | German
 
 .. _English: main.html
@@ -98,7 +98,7 @@ herunterzuladen und zu installieren::
 Anforderungen
 =============
 
-DBUtils unterstützt die Python_ Versionen 3.7 bis 3.12.
+DBUtils unterstützt die Python_ Versionen 3.7 bis 3.3.
 
 Die Module in der Variante für klassisches PyGreSQL benötigen PyGreSQL_
 Version 4.0 oder höher, während die Module in der allgemeinen Variante
@@ -584,7 +584,7 @@ Autoren
 Copyright und Lizenz
 ====================
 
-Copyright © 2005-2024 Christoph Zwerschke.
+Copyright © 2005-2025 Christoph Zwerschke.
 Alle Rechte vorbehalten.
 
 DBUtils ist freie und quelloffene Software,