Author: phd
Date: 2009-04-17 11:12:08 -0600 (Fri, 17 Apr 2009)
New Revision: 3858
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/dbconnection.py
Log:
Merged revision 3856 from branch 0.9:
Transaction instances now explicitly raises TypeError on close().
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2009-04-17 17:11:26 UTC (rev 3857)
+++ SQLObject/trunk/docs/News.txt 2009-04-17 17:12:08 UTC (rev 3858)
@@ -184,6 +184,10 @@
Transaction.__getattr__() cannot properly wrap 'self' so a property is
called with wrong 'self'.
+* Transaction instances now explicitly raises TypeError on close() -
+ without this calling Transaction.close() calls connection.close() which
+ is wrong.
+
SQLObject 0.9.9
===============
Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py 2009-04-17 17:11:26 UTC (rev 3857)
+++ SQLObject/trunk/sqlobject/dbconnection.py 2009-04-17 17:12:08 UTC (rev 3858)
@@ -791,6 +791,9 @@
return
self.rollback()
+ def close(self):
+ raise TypeError('You cannot just close transaction - you should either call rollback(), commit() or commit(close=True) to close the underlying connection.')
+
class ConnectionHub(object):
"""
|
