Use the new lower-case module names everywhere

Also use the bump2version tool instead of setversion.py.

Author: Cito

.bumpversion.cfg

@@ -0,0 +1,22 @@
+[bumpversion]
+current_version = 2.0
+
+[bumpversion:file:setup.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:dbutils/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:README.md]
+search = The current version {current_version}
+replace = The current version {new_version}
+
+[bumpversion:file:docs/main.rst]
+search = :Version: {current_version}
+search = :Version: {new_version}
+
+[bumpversion:file:docs/main.de.rst]
+search = :Version: {current_version}
+search = :Version: {new_version}

README.md

@@ -6,6 +6,6 @@ to a database that can be used in all kinds of multi-threaded environments
 like Webware for Python or other web application servers. The suite supports
 DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
 
-The current version of DBUtils supports Python versions 2.7 and 3.5 - 3.8.
+The current version 2.0 of DBUtils supports Python versions 2.7 and 3.5 - 3.8.
 
 The DBUtils home page can be found here: https://webwareforpython.github.io/DBUtils/

dbutils/__init__.py

@@ -1,12 +1,8 @@
-# DBUtils package
+# DBUtils main package
 
 __all__ = [
-    'SimplePooledPg', 'SteadyPg', 'PooledPg', 'PersistentPg',
-    'SimplePooledDB', 'SteadyDB', 'PooledDB', 'PersistentDB'
-]
+    '__version__',
+    'simple_pooled_pg', 'steady_pg', 'pooled_pg', 'persistent_pg',
+    'simple_pooled_db', 'steady_db', 'pooled_db', 'persistent_db']
 
-__version__ = '1.4'
-
-
-def InstallInWebKit(appServer):
-    pass
+__version__ = '2.0'

dbutils/persistent_db.py

@@ -64,7 +64,7 @@
 every connection to your local database 'mydb' to be reused 1000 times:
 
     import pgdb  # import used DB-API 2 module
-    from DBUtils.PersistentDB import PersistentDB
+    from dbutils.persistent_db import PersistentDB
     persist = PersistentDB(pgdb, 1000, database='mydb')
 
 Once you have set up the generator with these parameters, you can
@@ -111,9 +111,8 @@
 
 """
 
-from DBUtils.SteadyDB import connect
-
-__version__ = '1.4'
+from . import __version__
+from .steady_db import connect
 
 try:
     # Prefer the pure Python version of threading.local.

dbutils/persistent_pg.py

@@ -54,7 +54,7 @@
 For instance, if you want every connection to your local database 'mydb'
 to be reused 1000 times:
 
-    from DBUtils.PersistentPg import PersistentPg
+    from dbutils.persistent_pg import PersistentPg
     persist = PersistentPg(5, dbname='mydb')
 
 Once you have set up the generator with these parameters, you can
@@ -102,9 +102,8 @@
 
 """
 
-from DBUtils.SteadyPg import SteadyPgConnection
-
-__version__ = '1.4'
+from . import __version__
+from .steady_pg import SteadyPgConnection
 
 try:
     # Prefer the pure Python version of threading.local.

dbutils/pooled_db.py

@@ -74,7 +74,7 @@
 want a pool of at least five connections to your local database 'mydb':
 
     import pgdb  # import used DB-API 2 module
-    from DBUtils.PooledDB import PooledDB
+    from dbutils.pooled_db import PooledDB
     pool = PooledDB(pgdb, 5, database='mydb')
 
 Once you have set up the connection pool you can request
@@ -141,9 +141,8 @@
 
 from threading import Condition
 
-from DBUtils.SteadyDB import connect
-
-__version__ = '1.4'
+from . import __version__
+from .steady_db import connect
 
 
 class PooledDBError(Exception):

dbutils/pooled_pg.py

@@ -55,7 +55,7 @@
 For instance, if you want a pool of at least five connections
 to your local database 'mydb':
 
-    from DBUtils.PooledPg import PooledPg
+    from dbutils.pooled_pg import PooledPg
     pool = PooledPg(5, dbname='mydb')
 
 Once you have set up the connection pool you can request
@@ -113,9 +113,8 @@
 except ImportError:  # Python 3
     from queue import Queue, Empty, Full
 
-from DBUtils.SteadyPg import SteadyPgConnection
-
-__version__ = '1.4'
+from . import __version__
+from .steady_pg import SteadyPgConnection
 
 
 class PooledPgError(Exception):

dbutils/simple_pooled_db.py

@@ -26,7 +26,7 @@
 to be cached in the pool and the connection parameters, e.g.
 
     import pgdb  # import used DB-API 2 module
-    from DBUtils.SimplePooledDB import PooledDB
+    from dbutils.simple_pooled_db import PooledDB
     dbpool = PooledDB(pgdb, 5, host=..., database=..., user=..., ...)
 
 you can demand database connections from that pool,
@@ -73,7 +73,7 @@
 
 """
 
-__version__ = '1.4'
+from . import __version__
 
 
 class PooledDBError(Exception):

dbutils/simple_pooled_pg.py

@@ -26,7 +26,7 @@
 number of connections to be cached in the pool and the
 connection parameters, e.g.
 
-    from DBUtils.SimplePooledPg import PooledPg
+    from dbutils.simple_pooled_pg import PooledPg
     dbpool = PooledPg(5, host=..., database=..., user=..., ...)
 
 you can demand database connections from that pool,
@@ -70,7 +70,7 @@
 
 from pg import DB as PgConnection
 
-__version__ = '1.4'
+from . import __version__
 
 
 class PooledPgConnection:

dbutils/steady_db.py

@@ -58,7 +58,7 @@
 without further notice.
 
     import pgdb  # import used DB-API 2 module
-    from DBUtils.SteadyDB import connect
+    from dbutils.steady_db import connect
     db = connect(pgdb, 10000, ["set datestyle to german"],
         host=..., database=..., user=..., ...)
     ...
@@ -92,7 +92,7 @@
 
 import sys
 
-__version__ = '1.4'
+from . import __version__
 
 try:
     baseint = (int, long)