Added version number for the whole package.

Author: Cito

DBUtils/PersistentDB.py

@@ -96,6 +96,7 @@
 
 from DBUtils.SteadyDB import connect
 
+
 class PersistentDBError(Exception):
 	"""General PersistentDB error."""
 

DBUtils/PooledDB.py

@@ -123,6 +123,7 @@
 
 from DBUtils.SteadyDB import connect
 
+
 class PooledDBError(Exception):
 	"""General PooledDB error."""
 

DBUtils/PooledPg.py

@@ -107,6 +107,7 @@
 
 from DBUtils.SteadyPg import SteadyPgConnection
 
+
 class PooledPgError(Exception):
 	"""General PooledPg error."""
 

DBUtils/Testing/TestPersistentDB.py

@@ -31,10 +31,11 @@ def setUp(self):
 		dbapi.threadsafety = 1
 
 	def test0_CheckVersion(self):
-		TestPersistentDBVersion = __version__
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		from DBUtils.PersistentDB import __version__ as PersistentDBVersion
-		self.assertEqual(PersistentDBVersion, TestPersistentDBVersion)
-		self.assertEqual(PersistentDBVersion, PersistentDB.version)
+		self.assertEqual(PersistentDBVersion, __version__)
+		self.assertEqual(PersistentDB.version, __version__)
 
 	def test1_NoThreadsafety(self):
 		from DBUtils.PersistentDB import NotSupportedError

DBUtils/Testing/TestPersistentPg.py

@@ -28,10 +28,11 @@
 class TestPersistentPg(unittest.TestCase):
 
 	def test0_CheckVersion(self):
-		TestPersistentPgVersion = __version__
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		from DBUtils.PersistentPg import __version__ as PersistentPgVersion
-		self.assertEqual(PersistentPgVersion, TestPersistentPgVersion)
-		self.assertEqual(PersistentPgVersion, PersistentPg.version)
+		self.assertEqual(PersistentPgVersion, __version__)
+		self.assertEqual(PersistentPg.version, __version__)
 
 	def test1_PersistentPgClose(self):
 		for closeable in (0, 1):

DBUtils/Testing/TestPooledDB.py

@@ -28,10 +28,11 @@
 class TestPooledDB(unittest.TestCase):
 
 	def test00_CheckVersion(self):
-		TestPooledDBVersion = __version__
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		from DBUtils.PooledDB import __version__ as PooledDBVersion
-		self.assertEqual(PooledDBVersion, TestPooledDBVersion)
-		self.assertEqual(PooledDBVersion, PooledDB.version)
+		self.assertEqual(PooledDBVersion, __version__)
+		self.assertEqual(PooledDB.version, __version__)
 
 	def test01_NoThreadsafety(self):
 		from DBUtils.PooledDB import NotSupportedError

DBUtils/Testing/TestPooledPg.py

@@ -28,10 +28,11 @@
 class TestPooledPg(unittest.TestCase):
 
 	def test0_CheckVersion(self):
-		TestPooledPgVersion = __version__
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		from DBUtils.PooledPg import __version__ as PooledPgVersion
-		self.assertEqual(PooledPgVersion, TestPooledPgVersion)
-		self.assertEqual(PooledPgVersion, PooledPg.version)
+		self.assertEqual(PooledPgVersion, __version__)
+		self.assertEqual(PooledPg.version, __version__)
 
 	def test1_CreateConnection(self):
 		pool = PooledPg(1, 1, 0, 0, 0, None,

DBUtils/Testing/TestSimplePooledDB.py

@@ -19,15 +19,18 @@
 
 import sys
 
+
 # This module also serves as a mock object for an arbitrary DB-API 2 module:
 
 dbModule = sys.modules[__name__]
 
 threadsafety = 1
 
+
 def connect(database, user):
 	return Connection(database, user)
 
+
 class Connection:
 
 	def __init__(self, database, user):
@@ -43,6 +46,7 @@ def cursor(self):
 
 
 import unittest
+
 sys.path.insert(1, '../..')
 from DBUtils import SimplePooledDB
 
@@ -56,6 +60,8 @@ def my_dbpool(self, mythreadsafety, maxConnections):
 			'SimplePooledDBTestDB', 'SimplePooledDBTestUser')
 
 	def test0_check_version(self):
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		self.assertEqual(SimplePooledDB.__version__, __version__)
 		self.assertEqual(SimplePooledDB.PooledDB.version, __version__)
 

DBUtils/Testing/TestSimplePooledPg.py

@@ -37,6 +37,7 @@ def query(self):
 
 
 import unittest
+
 sys.path.insert(1, '../..')
 from DBUtils import SimplePooledPg
 
@@ -48,6 +49,8 @@ def my_dbpool(self, maxConnections):
 			'SimplePooledPgTestDB', 'SimplePooledPgTestUser')
 
 	def test0_check_version(self):
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		self.assertEqual(SimplePooledPg.__version__, __version__)
 		self.assertEqual(SimplePooledPg.PooledPg.version, __version__)
 

DBUtils/Testing/TestSteadyDB.py

@@ -117,6 +117,7 @@ def __del__(self):
 
 
 import unittest
+
 sys.path.insert(1, '../..')
 from DBUtils.SteadyDB import connect as SteadyDBconnect
 from DBUtils.SteadyDB import SteadyDBConnection
@@ -125,10 +126,11 @@ def __del__(self):
 class TestSteadyDB(unittest.TestCase):
 
 	def test0_CheckVersion(self):
-		TestSteadyDBVersion = __version__
+		from DBUtils import __version__ as DBUtilsVersion
+		self.assertEqual(DBUtilsVersion, __version__)
 		from DBUtils.SteadyDB import __version__ as SteadyDBVersion
-		self.assertEqual(SteadyDBVersion, TestSteadyDBVersion)
-		self.assertEqual(SteadyDBVersion, SteadyDBConnection.version)
+		self.assertEqual(SteadyDBVersion, __version__)
+		self.assertEqual(SteadyDBConnection.version, __version__)
 
 	def test1_MockedDBConnection(self):
 		db = connect('SteadyDBTestDB',