[Zodb-checkins] CVS: ZODB3/ZODB - Connection.py:1.100.2.7

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv12588

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	Connection.py 
Log Message:
Misc:  Reformat a little, remove old future statement, add comment.


=== ZODB3/ZODB/Connection.py 1.100.2.6 => 1.100.2.7 ===
--- ZODB3/ZODB/Connection.py:1.100.2.6	Tue Dec  2 02:10:30 2003
+++ ZODB3/ZODB/Connection.py	Fri Dec 19 10:08:59 2003
@@ -15,8 +15,6 @@
 
 $Id$"""
 
-from __future__ import nested_scopes
-
 from cPickleCache import PickleCache
 from POSException import ConflictError, ReadConflictError, TransactionError
 from ExtensionClass import Base
@@ -507,9 +505,11 @@
                 del o._p_jar
                 del o._p_oid
 
-    def db(self): return self._db
+    def db(self):
+        return self._db
 
-    def getVersion(self): return self._version
+    def getVersion(self):
+        return self._version
 
     def isReadOnly(self):
         return self._storage.isReadOnly()
@@ -644,6 +644,9 @@
         # The non-current transaction must have been written before
         # txn_time.  It must be current at txn_time, but could have
         # been modified at txn_time.
+
+        # It's possible that end is None, if, e.g., the most recent
+        # invalidation was for version data.
         assert start < self._txn_time <= end, \
                (U64(start), U64(self._txn_time), U64(end))
         self._noncurrent[obj._p_oid] = True