Commit 17d096be authored by Tim Peters's avatar Tim Peters

Merge rev 29855 from 3.4 branch.

modifiedInVersion:  remove set_trace() added during ZODB sprint.
parent f5c7df2f
...@@ -24,8 +24,8 @@ from time import time ...@@ -24,8 +24,8 @@ from time import time
from persistent import PickleCache from persistent import PickleCache
# interfaces # interfaces
from persistent.interfaces import IPersistentDataManager from persistent.interfaces import IPersistentDataManager
from ZODB.interfaces import IConnection from ZODB.interfaces import IConnection
from transaction.interfaces import IDataManager from transaction.interfaces import IDataManager
from zope.interface import implements from zope.interface import implements
...@@ -563,7 +563,7 @@ class Connection(ExportImport, object): ...@@ -563,7 +563,7 @@ class Connection(ExportImport, object):
def getDebugInfo(self): def getDebugInfo(self):
"""Returns a tuple with different items for debugging the """Returns a tuple with different items for debugging the
connection. connection.
""" """
return self._debug_info return self._debug_info
def setDebugInfo(self, *args): def setDebugInfo(self, *args):
...@@ -822,13 +822,12 @@ class Connection(ExportImport, object): ...@@ -822,13 +822,12 @@ class Connection(ExportImport, object):
def modifiedInVersion(self, oid): def modifiedInVersion(self, oid):
"""Returns the version the object with the given oid was modified in. """Returns the version the object with the given oid was modified in.
If it wasn't modified in a version, the current version of this If it wasn't modified in a version, the current version of this
connection is returned. connection is returned.
""" """
try: try:
return self._db.modifiedInVersion(oid) return self._db.modifiedInVersion(oid)
except KeyError: except KeyError:
import pdb; pdb.set_trace()
return self.getVersion() return self.getVersion()
def getVersion(self): def getVersion(self):
......
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