[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/Connection.py Merge rev 29855 from 3.4 branch.

[Tim Peters]

Log message for revision 29856:
  Merge rev 29855 from 3.4 branch.
  
  modifiedInVersion:  remove set_trace() added during ZODB sprint.
  

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

-=-
Modified: ZODB/trunk/src/ZODB/Connection.py
===================================================================
--- ZODB/trunk/src/ZODB/Connection.py	2005-04-03 15:19:18 UTC (rev 29855)
+++ ZODB/trunk/src/ZODB/Connection.py	2005-04-03 15:21:02 UTC (rev 29856)
@@ -24,8 +24,8 @@
 from persistent import PickleCache
 
 # interfaces
-from persistent.interfaces import IPersistentDataManager 
-from ZODB.interfaces import IConnection 
+from persistent.interfaces import IPersistentDataManager
+from ZODB.interfaces import IConnection
 from transaction.interfaces import IDataManager
 from zope.interface import implements
 
@@ -563,7 +563,7 @@
     def getDebugInfo(self):
         """Returns a tuple with different items for debugging the
         connection.
-        """ 
+        """
         return self._debug_info
 
     def setDebugInfo(self, *args):
@@ -822,13 +822,12 @@
     def modifiedInVersion(self, oid):
         """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.
         """
         try:
             return self._db.modifiedInVersion(oid)
         except KeyError:
-            import pdb; pdb.set_trace() 
             return self.getVersion()
 
     def getVersion(self):