Skip to content

Commit d50fbbc

Browse files
committed
Prepare next version, add README and LICENSE
Switch to MIT license because it is more common and less restrictive.
1 parent 6e26a18 commit d50fbbc

31 files changed

+124
-108
lines changed

.gitattributes

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
* text=auto eol=lf
2+
3+
*.bat text eol=crlf
4+
*.config text eol=lf
5+
*.css text eol=lf
6+
*.html text eol=lf
7+
*.js text eol=lf
8+
*.prefs text
9+
*.py text eol=lf
10+
*.rst text eol=lf
11+
*.sh text eol=lf
12+
*.txt text eol=lf
13+
*.po text eol=lf
14+
*.pot text eol=lf
15+
*.styl text eol=lf
16+
*.xml text
17+
18+
*.gif binary
19+
*.ico binary
20+
*.jpg binary
21+
*.lnk binary
22+
*.mo binary
23+
*.png binary
24+
*.exe binary
25+
*.so binary
26+
*.ppt binary
27+
*.pdf binary
28+
*.gz binary
29+
*.zip binary

.gitignore

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
*~
2+
*.bak
3+
*.default
4+
*.log
5+
*.patch
6+
*.pid
7+
*.pstats
8+
*.pyc
9+
*.pyo
10+
*.swp
11+
12+
Thumbs.db
13+
14+
.idea

DBUtils/Docs/UsersGuide.de.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
77
<title>Benutzeranleitung für DBUtils</title>
88
<link rel="stylesheet" href="Doc.css" type="text/css" />
99
</head>
@@ -15,8 +15,8 @@ <h1 class="title">Benutzeranleitung für DBUtils</h1>
1515
<col class="docinfo-content" />
1616
<tbody valign="top">
1717
<tr><th class="docinfo-name">Version:</th>
18-
<td>1.1</td></tr>
19-
<tr class="field"><th class="docinfo-name">Released:</th><td class="field-body">08/14/11</td>
18+
<td>1.1.1b1</td></tr>
19+
<tr class="field"><th class="docinfo-name">Released:</th><td class="field-body">01/31/17</td>
2020
</tr>
2121
<tr class="field"><th class="docinfo-name">Translations:</th><td class="field-body"><a class="reference external" href="UsersGuide.html">English</a> German</td>
2222
</tr>
@@ -593,10 +593,10 @@ <h1>Autoren</h1>
593593
</div>
594594
<div class="section" id="copyright-und-lizenz">
595595
<h1>Copyright und Lizenz</h1>
596-
<p>Copyright © 2005-2011 Christoph Zwerschke.
596+
<p>Copyright © 2005-2017 Christoph Zwerschke.
597597
Alle Rechte vorbehalten.</p>
598598
<p>DBUtils ist freie und quelloffene Software,
599-
lizenziert unter der <a class="reference external" href="http://www.opensource.org/licenses/osl-2.1.php">Open Software License version 2.1</a>.</p>
599+
lizenziert unter der <a class="reference external" href="https://opensource.org/licenses/MIT">MIT-Lizenz</a>.</p>
600600
</div>
601601
</div>
602602
</body>

DBUtils/Docs/UsersGuide.de.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Benutzeranleitung für DBUtils
22
+++++++++++++++++++++++++++++
33

4-
:Version: 1.1
5-
:Released: 08/14/11
4+
:Version: 1.1.1b1
5+
:Released: 01/31/17
66
:Translations: English_ German
77

88
.. _English: UsersGuide.html
@@ -580,10 +580,10 @@ Autoren
580580
Copyright und Lizenz
581581
====================
582582

583-
Copyright © 2005-2011 Christoph Zwerschke.
583+
Copyright © 2005-2017 Christoph Zwerschke.
584584
Alle Rechte vorbehalten.
585585

586586
DBUtils ist freie und quelloffene Software,
587-
lizenziert unter der `Open Software License version 2.1`__.
587+
lizenziert unter der `MIT-Lizenz`__.
588588

589-
__ http://www.opensource.org/licenses/osl-2.1.php
589+
__ https://opensource.org/licenses/MIT

DBUtils/Docs/UsersGuide.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
77
<title>DBUtils User's Guide</title>
88
<link rel="stylesheet" href="Doc.css" type="text/css" />
99
</head>
@@ -15,8 +15,8 @@ <h1 class="title">DBUtils User's Guide</h1>
1515
<col class="docinfo-content" />
1616
<tbody valign="top">
1717
<tr><th class="docinfo-name">Version:</th>
18-
<td>1.1</td></tr>
19-
<tr class="field"><th class="docinfo-name">Released:</th><td class="field-body">08/14/11</td>
18+
<td>1.1.1b1</td></tr>
19+
<tr class="field"><th class="docinfo-name">Released:</th><td class="field-body">01/31/17</td>
2020
</tr>
2121
<tr class="field"><th class="docinfo-name">Translations:</th><td class="field-body">English <a class="reference external" href="UsersGuide.de.html">German</a></td>
2222
</tr>
@@ -550,10 +550,10 @@ <h1>Credits</h1>
550550
</div>
551551
<div class="section" id="copyright-and-license">
552552
<h1>Copyright and License</h1>
553-
<p>Copyright © 2005-2011 by Christoph Zwerschke.
553+
<p>Copyright © 2005-2017 by Christoph Zwerschke.
554554
All Rights Reserved.</p>
555555
<p>DBUtils is free and open source software,
556-
licensed under the <a class="reference external" href="http://www.opensource.org/licenses/osl-2.1.php">Open Software License version 2.1</a>.</p>
556+
licensed under the <a class="reference external" href="https://opensource.org/licenses/MIT">MIT license</a>.</p>
557557
</div>
558558
</div>
559559
</body>

DBUtils/Docs/UsersGuide.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
DBUtils User's Guide
22
++++++++++++++++++++
33

4-
:Version: 1.1
5-
:Released: 08/14/11
4+
:Version: 1.1.1b1
5+
:Released: 01/31/17
66
:Translations: English German_
77

88
.. _German: UsersGuide.de.html
@@ -536,10 +536,10 @@ Credits
536536
Copyright and License
537537
=====================
538538

539-
Copyright © 2005-2011 by Christoph Zwerschke.
539+
Copyright © 2005-2017 by Christoph Zwerschke.
540540
All Rights Reserved.
541541

542542
DBUtils is free and open source software,
543-
licensed under the `Open Software License version 2.1`__.
543+
licensed under the `MIT license`__.
544544

545-
__ http://www.opensource.org/licenses/osl-2.1.php
545+
__ https://opensource.org/licenses/MIT

DBUtils/PersistentDB.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,11 @@
112112
* Based on an idea presented on the Webware developer mailing list
113113
by Geoffrey Talvola in July 2005
114114
115-
Licensed under the Open Software License version 2.1.
115+
Licensed under the MIT license.
116116
117117
"""
118118

119-
__version__ = '1.1'
120-
__revision__ = "$Rev$"
121-
__date__ = "$Date$"
122-
119+
__version__ = '1.1.1b1'
123120

124121
import ThreadingLocal
125122
from DBUtils.SteadyDB import connect

DBUtils/PersistentPg.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,11 @@
103103
* Based on an idea presented on the Webware developer mailing list
104104
by Geoffrey Talvola in July 2005
105105
106-
Licensed under the Open Software License version 2.1.
106+
Licensed under the MIT license.
107107
108108
"""
109109

110-
__version__ = '1.1'
111-
__revision__ = "$Rev$"
112-
__date__ = "$Date$"
110+
__version__ = '1.1.1b1'
113111

114112

115113
import ThreadingLocal

DBUtils/PooledDB.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,11 @@
135135
* Based on the code of DBPool, contributed to Webware for Python
136136
by Dan Green in December 2000
137137
138-
Licensed under the Open Software License version 2.1.
138+
Licensed under the MIT license.
139139
140140
"""
141141

142-
__version__ = '1.1'
143-
__revision__ = "$Rev$"
144-
__date__ = "$Date$"
142+
__version__ = '1.1.1b1'
145143

146144

147145
from threading import Condition

DBUtils/PooledPg.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,11 @@
104104
* Based on the code of DBPool, contributed to Webware for Python
105105
by Dan Green in December 2000
106106
107-
Licensed under the Open Software License version 2.1.
107+
Licensed under the MIT license.
108108
109109
"""
110110

111-
__version__ = '1.1'
112-
__revision__ = "$Rev$"
113-
__date__ = "$Date$"
114-
111+
__version__ = '1.1.1b1'
115112

116113
from Queue import Queue, Empty, Full
117114

DBUtils/Properties.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = 'DBUtils'
22

3-
version = (1, 1, 0)
3+
version = (1, 1, 1, 'b1')
44

55
docs = [
66
{'name': "User's Guide", 'file': 'UsersGuide.html'},

DBUtils/SimplePooledDB.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,11 @@
6969
* Clean-up and detailed commenting, rename and move to DBUtils
7070
by Christoph Zwerschke in September 2005
7171
72-
Licensed under the Open Software License version 2.1.
72+
Licensed under the MIT license.
7373
7474
"""
7575

76-
__version__ = '1.1'
77-
__revision__ = "$Rev$"
78-
__date__ = "$Date$"
79-
76+
__version__ = '1.1.1b1'
8077

8178
class PooledDBError(Exception):
8279
"""General PooledDB error."""

DBUtils/SimplePooledPg.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,11 @@
6464
* Based on the code of DBPool, contributed to Webware for Python
6565
by Dan Green in December 2000
6666
67-
Licensed under the Open Software License version 2.1.
67+
Licensed under the MIT license.
6868
6969
"""
7070

71-
__version__ = '1.1'
72-
__revision__ = "$Rev$"
73-
__date__ = "$Date$"
74-
71+
__version__ = '1.1.1b1'
7572

7673
from pg import DB as PgConnection
7774

DBUtils/SteadyDB.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,11 @@
8686
* Allowing creator functions as first parameter as in SQLAlchemy
8787
suggested by Ezio Vernacotola in December 2006
8888
89-
Licensed under the Open Software License version 2.1.
89+
Licensed under the MIT license.
9090
9191
"""
9292

93-
__version__ = '1.1'
94-
__revision__ = "$Rev$"
95-
__date__ = "$Date$"
96-
93+
__version__ = '1.1.1b1'
9794

9895
import sys
9996

DBUtils/SteadyPg.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,11 @@
6666
* Contributed as supplement for Webware for Python and PyGreSQL
6767
by Christoph Zwerschke in September 2005
6868
69-
Licensed under the Open Software License version 2.1.
69+
Licensed under the MIT license.
7070
7171
"""
7272

73-
__version__ = '1.1'
74-
__revision__ = "$Rev$"
75-
__date__ = "$Date$"
76-
73+
__version__ = '1.1.1b1'
7774

7875
from pg import DB as PgConnection
7976

DBUtils/Tests/TestPersistentDB.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
1212
"""
1313

14-
__version__ = '1.1'
15-
__revision__ = "$Rev$"
16-
__date__ = "$Date$"
17-
14+
__version__ = '1.1.1b1'
1815

1916
import sys
2017
import unittest

DBUtils/Tests/TestPersistentPg.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
1212
"""
1313

14-
__version__ = '1.1'
15-
__revision__ = "$Rev$"
16-
__date__ = "$Date$"
17-
14+
__version__ = '1.1.1b1'
1815

1916
import sys
2017
import unittest

DBUtils/Tests/TestPooledDB.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
1212
"""
1313

14-
__version__ = '1.1'
15-
__revision__ = "$Rev$"
16-
__date__ = "$Date$"
17-
14+
__version__ = '1.1.1b1'
1815

1916
import sys
2017
import unittest

DBUtils/Tests/TestPooledPg.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
1212
"""
1313

14-
__version__ = '1.1'
15-
__revision__ = "$Rev$"
16-
__date__ = "$Date$"
17-
14+
__version__ = '1.1.1b1'
1815

1916
import sys
2017
import unittest

DBUtils/Tests/TestSimplePooledDB.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
1313
"""
1414

15-
__version__ = '1.1'
16-
__revision__ = "$Rev$"
17-
__date__ = "$Date$"
18-
15+
__version__ = '1.1.1b1'
1916

2017
import sys
2118

22-
2319
# This module also serves as a mock object for an arbitrary DB-API 2 module:
2420

2521
dbModule = sys.modules[__name__]

DBUtils/Tests/TestSimplePooledPg.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
1212
"""
1313

14-
__version__ = '1.1'
15-
__revision__ = "$Rev$"
16-
__date__ = "$Date$"
17-
14+
__version__ = '1.1.1b1'
1815

1916
import sys
2017

DBUtils/Tests/TestSteadyDB.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
1111
"""
1212

13-
__version__ = '1.1'
14-
__revision__ = "$Rev$"
15-
__date__ = "$Date$"
16-
13+
__version__ = '1.1.1b1'
1714

1815
import sys
1916

0 commit comments

Comments
 (0)