Skip to content

Commit 7d15263

Browse files
CitoCito
committed
Support Python 3.10
Replace deprecated spelling of Condition.notify_all().
1 parent b71bb5d commit 7d15263

File tree

10 files changed

+86
-101
lines changed

10 files changed

+86
-101
lines changed

‎.github/workflows/publish_on_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python: [3.9, 2.7]
13+
python: ['3.9', '2.7']
1414

1515
steps:
1616
- uses: actions/checkout@v2

‎.github/workflows/test_with_tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
python: [2.7, 3.6, 3.7, 3.8, 3.9]
10+
python: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
1111

1212
steps:
1313
- uses: actions/checkout@v2

‎dbutils/pooled_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def close(self):
375375
except Exception:
376376
pass
377377
self._connections -= 1
378-
self._lock.notifyAll()
378+
self._lock.notify_all()
379379

380380
def __del__(self):
381381
"""Delete the pool."""

‎docs/changelog.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
<head>
44
<meta charset="utf-8"/>
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
6-
<meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
77
<title>Changelog for DBUtils</title>
88
<link rel="stylesheet" href="doc.css" type="text/css" />
99
</head>
1010
<body>
1111
<main id="changelog-for-dbutils">
1212
<h1 class="title">Changelog for DBUtils</h1>
1313

14-
<section id="id1">
14+
<section id="section-1">
1515
<h2>2.0.2</h2>
1616
<p>DBUtils 2.0.2 was released on June 8, 2021.</p>
1717
<p>Changes:</p>
1818
<ul class="simple">
1919
<li><p>Allow using context managers for pooled connections.</p></li>
2020
</ul>
2121
</section>
22-
<section id="id2">
22+
<section id="section-2">
2323
<h2>2.0.1</h2>
2424
<p>DBUtils 2.0.1 was released on April 8, 2021.</p>
2525
<p>Changes:</p>
2626
<ul class="simple">
2727
<li><p>Avoid &quot;name Exception is not defined&quot; when exiting.</p></li>
2828
</ul>
2929
</section>
30-
<section id="id3">
30+
<section id="section-3">
3131
<h2>2.0</h2>
3232
<p>DBUtils 2.0 was released on September 26, 2020.</p>
3333
<p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -43,7 +43,7 @@ <h2>2.0</h2>
4343
<li><p>This changelog has been compiled from the former release notes.</p></li>
4444
</ul>
4545
</section>
46-
<section id="id4">
46+
<section id="section-4">
4747
<h2>1.4</h2>
4848
<p>DBUtils 1.4 was released on September 26, 2020.</p>
4949
<p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -54,7 +54,7 @@ <h2>1.4</h2>
5454
inside a transaction.</p></li>
5555
</ul>
5656
</section>
57-
<section id="id5">
57+
<section id="section-5">
5858
<h2>1.3</h2>
5959
<p>DBUtils 1.3 was released on March 3, 2018.</p>
6060
<p>It is intended to be used with Python versions 2.6, 2.7 and 3.4 to 3.7.</p>
@@ -63,12 +63,12 @@ <h2>1.3</h2>
6363
<li><p>This version now supports context handlers for connections and cursors.</p></li>
6464
</ul>
6565
</section>
66-
<section id="id6">
66+
<section id="section-6">
6767
<h2>1.2</h2>
6868
<p>DBUtils 1.2 was released on February 5, 2017.</p>
6969
<p>It is intended to be used with Python versions 2.6, 2.7 and 3.0 to 3.6.</p>
7070
</section>
71-
<section id="id7">
71+
<section id="section-7">
7272
<h2>1.1.1</h2>
7373
<p>DBUtils 1.1.1 was released on February 4, 2017.</p>
7474
<p>It is intended to be used with Python versions 2.3 to 2.7.</p>
@@ -82,7 +82,7 @@ <h2>1.1.1</h2>
8282
<li><p>Fixed a problem when running under Jython (reported by Vitaly Kruglikov).</p></li>
8383
</ul>
8484
</section>
85-
<section id="id8">
85+
<section id="section-8">
8686
<h2>1.1</h2>
8787
<p>DBUtils 1.1 was released on August 14, 2011.</p>
8888
<p>Improvements:</p>
@@ -111,7 +111,7 @@ <h2>1.1</h2>
111111
<li><p>Fixed some minor issues with the <span class="docutils literal">DBUtilsExample</span> for Webware.</p></li>
112112
</ul>
113113
</section>
114-
<section id="id9">
114+
<section id="section-9">
115115
<h2>1.0</h2>
116116
<p>DBUtils 1.0 was released on November 29, 2008.</p>
117117
<p>It is intended to be used with Python versions 2.2 to 2.6.</p>
@@ -144,7 +144,7 @@ <h2>1.0</h2>
144144
the MySQLdb module (problem reported by Gregory Pinero).</p></li>
145145
</ul>
146146
</section>
147-
<section id="id10">
147+
<section id="section-10">
148148
<h2>0.9.4</h2>
149149
<p>DBUtils 0.9.4 was released on July 7, 2007.</p>
150150
<p>This release fixes a problem in the destructor code and has been supplemented
@@ -153,7 +153,7 @@ <h2>0.9.4</h2>
153153
in the last release, since you can now pass custom creator functions
154154
for database connections instead of DB-API 2 modules.</p>
155155
</section>
156-
<section id="id11">
156+
<section id="section-11">
157157
<h2>0.9.3</h2>
158158
<p>DBUtils 0.9.3 was released on May 21, 2007.</p>
159159
<p>Changes:</p>
@@ -168,7 +168,7 @@ <h2>0.9.3</h2>
168168
Added Chinese translation of the User's Guide, kindly contributed by gashero.</p></li>
169169
</ul>
170170
</section>
171-
<section id="id12">
171+
<section id="section-12">
172172
<h2>0.9.2</h2>
173173
<p>DBUtils 0.9.2 was released on September 22, 2006.</p>
174174
<p>It is intended to be used with Python versions 2.2 to 2.5.</p>
@@ -178,7 +178,7 @@ <h2>0.9.2</h2>
178178
storage engine. Accordingly, renamed <span class="docutils literal">SolidPg</span> to <span class="docutils literal">SteadyPg</span>.</p></li>
179179
</ul>
180180
</section>
181-
<section id="id13">
181+
<section id="section-13">
182182
<h2>0.9.1</h2>
183183
<p>DBUtils 0.9.1 was released on May 8, 2006.</p>
184184
<p>It is intended to be used with Python versions 2.2 to 2.4.</p>
@@ -192,7 +192,7 @@ <h2>0.9.1</h2>
192192
<li><p>Improved the documentation and added a User's Guide.</p></li>
193193
</ul>
194194
</section>
195-
<section id="id14">
195+
<section id="section-14">
196196
<h2>0.8.1 - 2005-09-13</h2>
197197
<p>DBUtils 0.8.1 was released on September 13, 2005.</p>
198198
<p>It is intended to be used with Python versions 2.0 to 2.4.</p>

‎docs/main.de.html

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,55 @@
33
<head>
44
<meta charset="utf-8"/>
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
6-
<meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
77
<title>Benutzeranleitung für DBUtils</title>
88
<link rel="stylesheet" href="doc.css" type="text/css" />
99
</head>
1010
<body class="with-toc">
1111
<main id="benutzeranleitung-fur-dbutils">
1212
<h1 class="title">Benutzeranleitung für DBUtils</h1>
1313
<dl class="docinfo simple">
14-
<dt class="version">Version</dt>
14+
<dt class="version">Version<span class="colon">:</span></dt>
1515
<dd class="version">2.0.2</dd>
16-
<dt class="translations">Translations</dt>
16+
<dt class="translations">Translations<span class="colon">:</span></dt>
1717
<dd class="translations"><p><a class="reference external" href="main.html">English</a> | German</p>
1818
</dd>
1919
</dl>
20-
<div class="contents topic" id="inhalt">
20+
<nav class="contents" id="inhalt" role="doc-toc">
2121
<p class="topic-title">Inhalt</p>
2222
<ul class="simple">
23-
<li><p><a class="reference internal" href="#zusammenfassung" id="id5">Zusammenfassung</a></p></li>
24-
<li><p><a class="reference internal" href="#module" id="id6">Module</a></p></li>
25-
<li><p><a class="reference internal" href="#download" id="id7">Download</a></p></li>
26-
<li><p><a class="reference internal" href="#installation" id="id8">Installation</a></p>
23+
<li><p><a class="reference internal" href="#zusammenfassung" id="toc-entry-1">Zusammenfassung</a></p></li>
24+
<li><p><a class="reference internal" href="#module" id="toc-entry-2">Module</a></p></li>
25+
<li><p><a class="reference internal" href="#download" id="toc-entry-3">Download</a></p></li>
26+
<li><p><a class="reference internal" href="#installation" id="toc-entry-4">Installation</a></p>
2727
<ul>
28-
<li><p><a class="reference internal" href="#id1" id="id9">Installation</a></p></li>
28+
<li><p><a class="reference internal" href="#installation-1" id="toc-entry-5">Installation</a></p></li>
2929
</ul>
3030
</li>
31-
<li><p><a class="reference internal" href="#anforderungen" id="id10">Anforderungen</a></p></li>
32-
<li><p><a class="reference internal" href="#funktionalitat" id="id11">Funktionalität</a></p>
31+
<li><p><a class="reference internal" href="#anforderungen" id="toc-entry-6">Anforderungen</a></p></li>
32+
<li><p><a class="reference internal" href="#funktionalitat" id="toc-entry-7">Funktionalität</a></p>
3333
<ul>
34-
<li><p><a class="reference internal" href="#simplepooleddb-simple-pooled-db" id="id12">SimplePooledDB (simple_pooled_db)</a></p></li>
35-
<li><p><a class="reference internal" href="#steadydbconnection-steady-db" id="id13">SteadyDBConnection (steady_db)</a></p></li>
36-
<li><p><a class="reference internal" href="#persistentdb-persistent-db" id="id14">PersistentDB (persistent_db)</a></p></li>
37-
<li><p><a class="reference internal" href="#pooleddb-pooled-db" id="id15">PooledDB (pooled_db)</a></p></li>
38-
<li><p><a class="reference internal" href="#die-qual-der-wahl" id="id16">Die Qual der Wahl</a></p></li>
34+
<li><p><a class="reference internal" href="#simplepooleddb-simple-pooled-db" id="toc-entry-8">SimplePooledDB (simple_pooled_db)</a></p></li>
35+
<li><p><a class="reference internal" href="#steadydbconnection-steady-db" id="toc-entry-9">SteadyDBConnection (steady_db)</a></p></li>
36+
<li><p><a class="reference internal" href="#persistentdb-persistent-db" id="toc-entry-10">PersistentDB (persistent_db)</a></p></li>
37+
<li><p><a class="reference internal" href="#pooleddb-pooled-db" id="toc-entry-11">PooledDB (pooled_db)</a></p></li>
38+
<li><p><a class="reference internal" href="#die-qual-der-wahl" id="toc-entry-12">Die Qual der Wahl</a></p></li>
3939
</ul>
4040
</li>
41-
<li><p><a class="reference internal" href="#benutzung" id="id17">Benutzung</a></p>
41+
<li><p><a class="reference internal" href="#benutzung" id="toc-entry-13">Benutzung</a></p>
4242
<ul>
43-
<li><p><a class="reference internal" href="#id2" id="id18">PersistentDB (persistent_db)</a></p></li>
44-
<li><p><a class="reference internal" href="#id3" id="id19">PooledDB (pooled_db)</a></p></li>
43+
<li><p><a class="reference internal" href="#persistentdb-persistent-db-1" id="toc-entry-14">PersistentDB (persistent_db)</a></p></li>
44+
<li><p><a class="reference internal" href="#pooleddb-pooled-db-1" id="toc-entry-15">PooledDB (pooled_db)</a></p></li>
4545
</ul>
4646
</li>
47-
<li><p><a class="reference internal" href="#anmerkungen" id="id20">Anmerkungen</a></p></li>
48-
<li><p><a class="reference internal" href="#zukunft" id="id21">Zukunft</a></p></li>
49-
<li><p><a class="reference internal" href="#fehlermeldungen-und-feedback" id="id22">Fehlermeldungen und Feedback</a></p></li>
50-
<li><p><a class="reference internal" href="#links" id="id23">Links</a></p></li>
51-
<li><p><a class="reference internal" href="#autoren" id="id24">Autoren</a></p></li>
52-
<li><p><a class="reference internal" href="#copyright-und-lizenz" id="id25">Copyright und Lizenz</a></p></li>
47+
<li><p><a class="reference internal" href="#anmerkungen" id="toc-entry-16">Anmerkungen</a></p></li>
48+
<li><p><a class="reference internal" href="#zukunft" id="toc-entry-17">Zukunft</a></p></li>
49+
<li><p><a class="reference internal" href="#fehlermeldungen-und-feedback" id="toc-entry-18">Fehlermeldungen und Feedback</a></p></li>
50+
<li><p><a class="reference internal" href="#links" id="toc-entry-19">Links</a></p></li>
51+
<li><p><a class="reference internal" href="#autoren" id="toc-entry-20">Autoren</a></p></li>
52+
<li><p><a class="reference internal" href="#copyright-und-lizenz" id="toc-entry-21">Copyright und Lizenz</a></p></li>
5353
</ul>
54-
</div>
54+
</nav>
5555
<section id="zusammenfassung">
5656
<h2>Zusammenfassung</h2>
5757
<p><a class="reference external" href="https://github.com/WebwareForPython/DBUtils">DBUtils</a> ist eine Sammlung von Python-Modulen, mit deren Hilfe man in <a class="reference external" href="https://www.python.org">Python</a>
@@ -69,10 +69,6 @@ <h2>Module</h2>
6969
DB-API-2-Datenbankadaptern, und einer Gruppe zur Verwendung mit dem klassischen
7070
PyGreSQL-Datenbankadapter-Modul.</p>
7171
<table>
72-
<colgroup>
73-
<col style="width: 28%" />
74-
<col style="width: 72%" />
75-
</colgroup>
7672
<thead>
7773
<tr><th class="head" colspan="2"><p>Allgemeine Variante für beliebige DB-API-2-Adapter</p></th>
7874
</tr>
@@ -93,10 +89,6 @@ <h2>Module</h2>
9389
</tbody>
9490
</table>
9591
<table>
96-
<colgroup>
97-
<col style="width: 28%" />
98-
<col style="width: 72%" />
99-
</colgroup>
10092
<thead>
10193
<tr><th class="head" colspan="2"><p>Variante speziell für den klassischen PyGreSQL-Adapter</p></th>
10294
</tr>
@@ -133,7 +125,7 @@ <h2>Download</h2>
133125
</section>
134126
<section id="installation">
135127
<h2>Installation</h2>
136-
<section id="id1">
128+
<section id="installation-1">
137129
<h3>Installation</h3>
138130
<p>Das Paket kann auf die übliche Weise installiert werden:</p>
139131
<pre class="literal-block">python setup.py install</pre>
@@ -144,7 +136,7 @@ <h3>Installation</h3>
144136
</section>
145137
<section id="anforderungen">
146138
<h2>Anforderungen</h2>
147-
<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 2.7 und 3.5 bis 3.9.</p>
139+
<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 2.7 und 3.5 bis 3.10.</p>
148140
<p>Die Module in der Variante für klassisches PyGreSQL benötigen <a class="reference external" href="https://www.pygresql.org/">PyGreSQL</a>
149141
Version 4.0 oder höher, während die Module in der allgemeinen Variante
150142
für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul zusammenarbeiten,
@@ -274,7 +266,7 @@ <h2>Benutzung</h2>
274266
sich die Dokumentation des <span class="docutils literal">pooled_db</span>-Moduls wie folgt anzeigen lassen (dies
275267
funktioniert entsprechend auch mit den anderen Modulen):</p>
276268
<pre class="literal-block">help(pooled_db)</pre>
277-
<section id="id2">
269+
<section id="persistentdb-persistent-db-1">
278270
<h3>PersistentDB (persistent_db)</h3>
279271
<p>Wenn Sie das <span class="docutils literal">persistent_db</span>-Modul einsetzen möchten, müssen Sie zuerst einen
280272
Generator für die von Ihnen gewünschte Art von Datenbankverbindungen einrichten,
@@ -338,7 +330,7 @@ <h3>PersistentDB (persistent_db)</h3>
338330
<span class="docutils literal">mod_wsgi</span> hier Probleme bereitet, da es Daten, die mit <span class="docutils literal">threading.local</span>
339331
gespeichert wurden, zwischen Requests löscht).</p>
340332
</section>
341-
<section id="id3">
333+
<section id="pooleddb-pooled-db-1">
342334
<h3>PooledDB (pooled_db)</h3>
343335
<p>Wenn Sie das <span class="docutils literal">pooled_db</span>-Modul einsetzen möchten, müssen Sie zuerst einen
344336
Pool für die von Ihnen gewünschte Art von Datenbankverbindungen einrichten,
@@ -506,10 +498,10 @@ <h2>Links</h2>
506498
<section id="autoren">
507499
<h2>Autoren</h2>
508500
<dl class="field-list simple">
509-
<dt>Autor</dt>
501+
<dt>Autor<span class="colon">:</span></dt>
510502
<dd><p><a class="reference external" href="https://github.com/Cito">Christoph Zwerschke</a></p>
511503
</dd>
512-
<dt>Beiträge</dt>
504+
<dt>Beiträge<span class="colon">:</span></dt>
513505
<dd><p>DBUtils benutzt Code, Anmerkungen und Vorschläge von
514506
Ian Bicking, Chuck Esterbrook (Webware for Python), Dan Green (DBTools),
515507
Jay Love, Michael Palmer, Tom Schwaller, Geoffrey Talvola,

‎docs/main.de.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ herunterzuladen und zu installieren::
9898
Anforderungen
9999
=============
100100

101-
DBUtils unterstützt die Python_ Versionen 2.7 und 3.5 bis 3.9.
101+
DBUtils unterstützt die Python_ Versionen 2.7 und 3.5 bis 3.10.
102102

103103
Die Module in der Variante für klassisches PyGreSQL benötigen PyGreSQL_
104104
Version 4.0 oder höher, während die Module in der allgemeinen Variante

0 commit comments

Comments
 (0)