Commit 54ee7efb authored by Tim Peters's avatar Tim Peters

Merge rev 27717 from 3.3 branch.

Merge rev 27712 from Zope trunk.

Restore the Connection._opened attribute, actually used by
DB.connectionDebugInfo().
parent bf63db67
...@@ -31,6 +31,11 @@ transaction ...@@ -31,6 +31,11 @@ transaction
The deprecation warning for ``Transaction.begin()`` was changed to The deprecation warning for ``Transaction.begin()`` was changed to
point to the caller, instead of to ``Transaction.begin()`` itself. 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? What's new in ZODB3 3.3 release candidate 1?
============================================ ============================================
......
...@@ -178,6 +178,7 @@ class Connection(ExportImport, object): ...@@ -178,6 +178,7 @@ class Connection(ExportImport, object):
self._log = logging.getLogger("ZODB.Connection") self._log = logging.getLogger("ZODB.Connection")
self._storage = None self._storage = None
self._debug_info = () self._debug_info = ()
self._opened = None # time.time() when DB.open() opened us
self._version = version self._version = version
self._cache = cache = PickleCache(self, cache_size) self._cache = cache = PickleCache(self, cache_size)
...@@ -434,6 +435,7 @@ class Connection(ExportImport, object): ...@@ -434,6 +435,7 @@ class Connection(ExportImport, object):
self._storage = odb._storage self._storage = odb._storage
self._sortKey = odb._storage.sortKey self._sortKey = odb._storage.sortKey
self.new_oid = odb._storage.new_oid self.new_oid = odb._storage.new_oid
self._opened = time()
if synch is not None: if synch is not None:
self._synch = synch self._synch = synch
if mvcc is not None: if mvcc is not None:
...@@ -570,6 +572,7 @@ class Connection(ExportImport, object): ...@@ -570,6 +572,7 @@ class Connection(ExportImport, object):
self.__onCloseCallbacks = None self.__onCloseCallbacks = None
self._storage = self._tmp = self.new_oid = None self._storage = self._tmp = self.new_oid = None
self._debug_info = () self._debug_info = ()
self._opened = None
# Return the connection to the pool. # Return the connection to the pool.
if self._db is not None: if self._db is not None:
if self._synch: if self._synch:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment