[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 27717 from 3.3 branch.

[Tim Peters]

Log message for revision 27718:
  Merge rev 27717 from 3.3 branch.
  
  Merge rev 27712 from Zope trunk.
  
  Restore the Connection._opened attribute, actually used by
  DB.connectionDebugInfo().
  


Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZODB/Connection.py


-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2004-09-30 19:16:27 UTC (rev 27717)
+++ ZODB/trunk/NEWS.txt	2004-09-30 19:17:53 UTC (rev 27718)
@@ -31,7 +31,12 @@
 The deprecation warning for ``Transaction.begin()`` was changed to
 point to the caller, instead of to ``Transaction.begin()`` itself.
 
+Connection
+----------
 
+Restored Connection's private ``_opened`` attribute.  This was still
+referenced by ``DB.connectionDebugInfo()``, and Zope 2 calls the latter.
+
 What's new in ZODB3 3.3 release candidate 1?
 ============================================
 Release date: 14-Sep-2004

Modified: ZODB/trunk/src/ZODB/Connection.py
===================================================================
--- ZODB/trunk/src/ZODB/Connection.py	2004-09-30 19:16:27 UTC (rev 27717)
+++ ZODB/trunk/src/ZODB/Connection.py	2004-09-30 19:17:53 UTC (rev 27718)
@@ -178,6 +178,7 @@
         self._log = logging.getLogger("ZODB.Connection")
         self._storage = None
         self._debug_info = ()
+        self._opened = None # time.time() when DB.open() opened us
 
         self._version = version
         self._cache = cache = PickleCache(self, cache_size)
@@ -434,6 +435,7 @@
         self._storage = odb._storage
         self._sortKey = odb._storage.sortKey
         self.new_oid = odb._storage.new_oid
+        self._opened = time()
         if synch is not None:
             self._synch = synch
         if mvcc is not None:
@@ -570,6 +572,7 @@
             self.__onCloseCallbacks = None
         self._storage = self._tmp = self.new_oid = None
         self._debug_info = ()
+        self._opened = None
         # Return the connection to the pool.
         if self._db is not None:
             if self._synch: