The values True and False are already defined in Python 2.2, so we should use them where appropriate.

Author: Cito

DBUtils/Docs/UsersGuide.de.txt

@@ -275,8 +275,8 @@ Parameter angeben müssen:
   bei denen die Ausfallsicherung zum Tragen kommen soll, falls die Vorgabe
   (OperationalError, InternalError) nicht geeignet sein sollte
 
-* ``closeable``: wenn dies auf einen wahren Wert gesetzt wird, dann wird das
-  Schließen von Verbindungen erlaubt, normalerweise wird es jedoch ignoriert
+* ``closeable``: wenn dies auf ``True`` gesetzt wird, dann wird das Schließen
+  von Verbindungen erlaubt, normalerweise wird es jedoch ignoriert
 
 * Die als ``creator`` angegebene Funktion oder die Funktion ``connect``
   des DB-API-2-Datenbankadapter-Moduls erhalten alle weiteren Parameter,
@@ -336,10 +336,11 @@ Parameter angeben müssen:
   die insgesamt überhaupt erlaubt werden sollen (der Standardwert ``0``
   bedeutet unbegrenzte Anzahl von Datenbankverbindungen)
 
-* ``blocking``: bestimmt das Verhalten, wenn diese Obergrenze überschritten
-  wird (der Standardwert ``0`` oder ein nicht wahrer Wert bedeutet, dass eine
-  Fehlermeldung ausgegeben wird, andernfalls wird blockiert und gewartet,
-  bis die Anzahl an Datenbankverbindungen wieder abnimmt)
+* ``blocking``: bestimmt das Verhalten bei Überschreitung dieser Obergrenze
+
+  Wenn dies auf ``True`` gesetzt wird, dann wird so lange gewartet, bis die
+  Anzahl an Datenbankverbindungen wieder abnimmt, normalerweise wird jedoch
+  sofort eine Fehlermeldung ausgegeben.
 
 * ``maxusage``: Obergrenze dafür, wie oft eine einzelne Verbindung
   wiederverwendet werden darf (der Standardwert ``0`` oder ``None``

DBUtils/Docs/UsersGuide.txt

@@ -310,8 +310,9 @@ following parameters:
   (the default value of ``0`` means any number of connections)
 
 * ``blocking``: determines behavior when exceeding the maximum
-  (the default of ``0`` or any false value means report an error;
-  otherwise block and wait until the number of connections decreases)
+
+  If this is set to true, block and wait until the number of
+  connections decreases, but by default an error will be reported.
 
 * ``maxusage``: maximum number of reuses of a single connection
   (the default of ``0`` or ``None`` means unlimited reuse)

DBUtils/Examples/DBUtilsExample.py

@@ -106,11 +106,11 @@ def postAction(self, actionName):
 	def output(self, s):
 		self._output.append(s)
 
-	def outputMsg(self, msg, error=0):
+	def outputMsg(self, msg, error=False):
 		self._output.append('<p style="color:%s">%s</p>'
 			% (error and 'red' or 'green', msg))
 
-	def connection(self, shareable=1):
+	def connection(self, shareable=True):
 		if self.dbstatus:
 			error = self.dbstatus
 		else:
@@ -123,7 +123,7 @@ def connection(self, shareable=1):
 				error = str(error)
 			except Exception:
 				error = 'Cannot connect to the database.'
-		self.outputMsg(error, 1)
+		self.outputMsg(error, True)
 
 	def sqlEncode(self, s):
 		if s is None:
@@ -132,7 +132,7 @@ def sqlEncode(self, s):
 		return "'%s'" % s
 
 	def createTables(self):
-		db = self.connection(0)
+		db = self.connection(False)
 		if not db:
 			return
 		for table in tables:
@@ -148,7 +148,7 @@ def createTables(self):
 			except self.dbapi.Error, error:
 				if self.dbapi_name != 'pg':
 					db.rollback()
-				self.outputMsg(error, 1)
+				self.outputMsg(error, True)
 			else:
 				self.outputMsg('The table was successfully created.')
 		db.close()
@@ -160,7 +160,7 @@ def listSeminars(self):
 				id = [id]
 			cmd = ','.join(map(self.sqlEncode, id))
 			cmd = 'delete from seminars where id in (%s)' % cmd
-			db = self.connection(0)
+			db = self.connection(False)
 			if not db:
 				return
 			try:
@@ -179,7 +179,7 @@ def listSeminars(self):
 						db.rollback()
 				except Exception:
 					pass
-				self.outputMsg(error, 1)
+				self.outputMsg(error, True)
 				return
 			else:
 				self.outputMsg('Entries deleted: %d' % len(id))
@@ -197,10 +197,10 @@ def listSeminars(self):
 				result = cursor.fetchall()
 				cursor.close()
 		except self.dbapi.Error, error:
-			self.outputMsg(error, 1)
+			self.outputMsg(error, True)
 			return
 		if not result:
-			self.outputMsg('There are no seminars in the database.', 1)
+			self.outputMsg('There are no seminars in the database.', True)
 			return
 		wr = self.output
 		button = self._buttons[1].replace('List seminars', 'Delete')
@@ -236,7 +236,7 @@ def listAttendees(self):
 			for i, n in places.items():
 				cmds.append("update seminars set places_left=places_left+%d "
 				"where id=%s" % (n, self.sqlEncode(i)))
-			db = self.connection(0)
+			db = self.connection(False)
 			if not db:
 				return
 			try:
@@ -254,7 +254,7 @@ def listAttendees(self):
 					db.query('end')
 				else:
 					db.rollback()
-				self.outputMsg(error, 1)
+				self.outputMsg(error, True)
 				return
 			else:
 				self.outputMsg('Entries deleted: %d' % len(id))
@@ -274,10 +274,10 @@ def listAttendees(self):
 				result = cursor.fetchall()
 				cursor.close()
 		except self.dbapi.Error, error:
-			self.outputMsg(error, 1)
+			self.outputMsg(error, True)
 			return
 		if not result:
-			self.outputMsg('There are no attendees in the database.', 1)
+			self.outputMsg('There are no attendees in the database.', True)
 			return
 		wr = self.output
 		button = self._buttons[2].replace('List attendees', 'Delete')
@@ -338,7 +338,7 @@ def newSeminar(self):
 				db.query('end')
 			else:
 				db.rollback()
-			self.outputMsg(error, 1)
+			self.outputMsg(error, True)
 		else:
 			self.outputMsg('"%s" added to seminars.' % values[1])
 		db.close()
@@ -358,7 +358,7 @@ def newAttendee(self):
 				result = cursor.fetchall()
 				cursor.close()
 		except self.dbapi.Error, error:
-			self.outputMsg(error, 1)
+			self.outputMsg(error, True)
 			return
 		if not result:
 			self.outputMsg('You have to define seminars first.')
@@ -425,7 +425,7 @@ def newAttendee(self):
 				db.query('end')
 			else:
 				db.rollback()
-			self.outputMsg(error, 1)
+			self.outputMsg(error, True)
 		else:
 			self.outputMsg('%s added to attendees.' % values[0])
 		db.close()

DBUtils/PersistentDB.py

@@ -115,7 +115,7 @@ class PersistentDB:
 	version = __version__
 
 	def __init__(self, creator,
-		maxusage=0, setsession=None, failures=None, closeable=0,
+		maxusage=None, setsession=None, failures=None, closeable=False,
 		*args, **kwargs):
 		"""Set up the persistent DB-API 2 connection generator.
 
@@ -159,7 +159,7 @@ def steady_connection(self):
 			self._failures, self._closeable,
 			*self._args, **self._kwargs)
 
-	def connection(self, shareable=0):
+	def connection(self, shareable=False):
 		"""Get a steady, persistent DB-API 2 connection.
 
 		The shareable parameter exists only for compatibility with the

DBUtils/PersistentPg.py

@@ -106,7 +106,7 @@ class PersistentPg:
 
 	version = __version__
 
-	def __init__(self, maxusage=0, setsession=None, closeable=0,
+	def __init__(self, maxusage=None, setsession=None, closeable=False,
 			*args, **kwargs):
 		"""Set up the persistent PostgreSQL connection generator.
 

DBUtils/PooledDB.py

@@ -40,8 +40,8 @@
 	maxconnections: maximum number of connections generally allowed
 		(the default value of 0 means any number of connections)
 	blocking: determines behavior when exceeding the maximum
-		(the default of 0 or false means report an error; otherwise
-		block and wait until the number of connections decreases)
+		(if this is set to true, block and wait until the number of
+		connections decreases, but by default an error will be reported)
 	maxusage: maximum number of reuses of a single connection
 		(the default of 0 or None means unlimited reuse)
 		When this maximum usage number of the connection is reached,
@@ -149,8 +149,8 @@ class PooledDB:
 
 	def __init__(self, creator,
 		mincached=0, maxcached=0,
-		maxshared=0, maxconnections=0, blocking=0,
-		maxusage=0, setsession=None, failures=None,
+		maxshared=0, maxconnections=0, blocking=False,
+		maxusage=None, setsession=None, failures=None,
 		*args, **kwargs):
 		"""Set up the DB-API 2 connection pool.
 
@@ -167,8 +167,8 @@ def __init__(self, creator,
 		maxconnections: maximum number of connections generally allowed
 			(0 means an arbitrary number of connections)
 		blocking: determines behavior when exceeding the maximum
-			(0 or any false value means report an error; otherwise
-			block and wait until the number of connections decreases)
+			(if this is set to true, block and wait until the number of
+			connections decreases, otherwise an error will be reported)
 		maxusage: maximum number of reuses of a single connection
 			(0 or None means unlimited reuse)
 			When this maximum usage number of the connection is reached,
@@ -228,10 +228,10 @@ def wait():
 	def steady_connection(self):
 		"""Get a steady, unpooled DB-API 2 connection."""
 		return connect(self._creator,
-			self._maxusage, self._setsession, self._failures, 1,
+			self._maxusage, self._setsession, self._failures, True,
 				*self._args, **self._kwargs)
 
-	def connection(self, shareable=1):
+	def connection(self, shareable=True):
 		""""Get a steady, cached DB-API 2 connection from the pool.
 
 		If shareable is set and the underlying DB-API 2 allows it,

DBUtils/PooledPg.py

@@ -35,8 +35,8 @@
 	maxconnections: maximum number of connections generally allowed
 		(the default value of 0 means any number of connections)
 	blocking: determines behavior when exceeding the maximum
-		(the default of 0 or false means report an error; otherwise
-		block and wait until the number of connections decreases)
+		(if this is set to true, block and wait until the number of
+		connections decreases, but by default an error will be reported)
 	maxusage: maximum number of reuses of a single connection
 		(the default of 0 or None means unlimited reuse)
 		When this maximum usage number of the connection is reached,
@@ -130,8 +130,8 @@ class PooledPg:
 
 	def __init__(self,
 		mincached=0, maxcached=0,
-		maxconnections=0, blocking=0,
-		maxusage=0, setsession=None,
+		maxconnections=0, blocking=False,
+		maxusage=None, setsession=None,
 		*args, **kwargs):
 		"""Set up the PostgreSQL connection pool.
 
@@ -142,8 +142,8 @@ def __init__(self,
 		maxconnections: maximum number of connections generally allowed
 			(0 means an arbitrary number of connections)
 		blocking: determines behavior when exceeding the maximum
-			(0 or any false value means report an error; otherwise
-			block and wait until the number of connections decreases)
+			(if this is set to true, block and wait until the number of
+			connections decreases, otherwise an error will be reported)
 		maxusage: maximum number of reuses of a single connection
 			(0 or None means unlimited reuse)
 			When this maximum usage number of the connection is reached,
@@ -175,7 +175,7 @@ def __init__(self,
 
 	def steady_connection(self):
 		"""Get a steady, unpooled PostgreSQL connection."""
-		return SteadyPgConnection(self._maxusage, self._setsession, 1,
+		return SteadyPgConnection(self._maxusage, self._setsession, True,
 			*self._args, **self._kwargs)
 
 	def connection(self):

DBUtils/SteadyDB.py

@@ -93,8 +93,8 @@
 import sys
 
 
-def connect(creator, maxusage=0, setsession=None, failures=None,
-		closeable=1, *args, **kwargs):
+def connect(creator, maxusage=None, setsession=None, failures=None,
+		closeable=True, *args, **kwargs):
 	"""A tough version of the connection constructor of a DB-API 2 module.
 
 	creator: either an arbitrary function returning new DB-API 2 compliant
@@ -123,10 +123,10 @@ class SteadyDBConnection:
 
 	version = __version__
 
-	_closed = 1
+	_closed = True
 
-	def __init__(self, creator, maxusage=0, setsession=None, failures=None,
-			closeable=1, *args, **kwargs):
+	def __init__(self, creator, maxusage=None, setsession=None, failures=None,
+			closeable=True, *args, **kwargs):
 		""""Create a "tough" DB-API 2 connection."""
 		try:
 			self._creator = creator.connect
@@ -194,7 +194,7 @@ def _setsession(self, con=None):
 	def _store(self, con):
 		"""Store a database connection for subsequent use."""
 		self._con = con
-		self._closed = 0
+		self._closed = False
 		self._usage = 0
 
 	def _close(self):
@@ -209,7 +209,7 @@ def _close(self):
 				self._con.close()
 			except Exception:
 				pass
-			self._closed = 1
+			self._closed = True
 
 	def dbapi(self):
 		"""Return the underlying DB-API 2 module of the connection."""
@@ -287,15 +287,15 @@ def __del__(self):
 class SteadyDBCursor:
 	"""A "tough" version of DB-API 2 cursors."""
 
-	_closed = 1
+	_closed = True
 
 	def __init__(self, con, *args, **kwargs):
 		""""Create a "tough" DB-API 2 cursor."""
 		self._con = con
 		self._args, self._kwargs = args, kwargs
 		self._clearsizes()
 		self._cursor = con._cursor(*args, **kwargs)
-		self._closed = 0
+		self._closed = False
 
 	def setinputsizes(self, sizes):
 		"""Store input sizes in case cursor needs to be reopened."""
@@ -336,7 +336,7 @@ def close(self):
 				self._cursor.close()
 			except Exception:
 				pass
-			self._closed = 1
+			self._closed = True
 
 	def _get_tough_method(self, name):
 		"""Return a "tough" version of the method."""

DBUtils/SteadyPg.py

@@ -89,9 +89,9 @@ class SteadyPgConnection:
 
 	version = __version__
 
-	_closed = 1
+	_closed = True
 
-	def __init__(self, maxusage=0, setsession=None, closeable=1,
+	def __init__(self, maxusage=None, setsession=None, closeable=True,
 			*args, **kwargs):
 		"""Create a "tough" PostgreSQL connection.
 
@@ -112,7 +112,7 @@ def __init__(self, maxusage=0, setsession=None, closeable=1,
 		self._setsession_sql = setsession
 		self._closeable = closeable
 		self._con = PgConnection(*args, **kwargs)
-		self._closed = 0
+		self._closed = False
 		self._setsession()
 		self._usage = 0
 
@@ -134,7 +134,7 @@ def _close(self):
 				self._con.close()
 			except Exception:
 				pass
-			self._closed = 1
+			self._closed = True
 
 	def close(self):
 		"""Close the tough connection.
@@ -161,7 +161,7 @@ def reopen(self):
 		except Exception:
 			pass
 		else:
-			self._closed = 0
+			self._closed = False
 			self._setsession()
 			self._usage = 0