[Zope3-checkins] CVS: ZODB3/ZODB - Transaction.py:1.49.4.4 fspack.py:1.8.8.9

[Tim Peters]

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

Modified Files:
      Tag: Zope-2_7-branch
	Transaction.py fspack.py 
Log Message:
Whitespace normalization.


=== ZODB3/ZODB/Transaction.py 1.49.4.3 => 1.49.4.4 ===
--- ZODB3/ZODB/Transaction.py:1.49.4.3	Sat May 22 18:38:28 2004
+++ ZODB3/ZODB/Transaction.py	Wed Jun  9 14:42:08 2004
@@ -137,11 +137,11 @@
                     if t is None:
                         t, v, tb = sys.exc_info()
                     else:
-                        if getattr(o,'_p_oid',None): 
-                            msg = "Failed to abort object %s" % repr(o._p_oid) 
-                        else: 
-                            msg = "Failed to abort object" 
-                        self.log(msg, error=sys.exc_info()) 
+                        if getattr(o,'_p_oid',None):
+                            msg = "Failed to abort object %s" % repr(o._p_oid)
+                        else:
+                            msg = "Failed to abort object"
+                        self.log(msg, error=sys.exc_info())
 
             # tpc_begin() was never called, so tpc_abort() should not be
             # called.
@@ -393,11 +393,11 @@
                     j.abort(o, self)
             except:
                 # nothing to do but log the error
-                if getattr(o,'_p_oid',None): 
-                    msg = "Failed to abort object %s" % repr(o._p_oid) 
-                else: 
-                    msg = "Failed to abort object" 
-                self.log(msg, error=sys.exc_info()) 
+                if getattr(o,'_p_oid',None):
+                    msg = "Failed to abort object %s" % repr(o._p_oid)
+                else:
+                    msg = "Failed to abort object"
+                self.log(msg, error=sys.exc_info())
 
         # Abort the two-phase commit.  It's only necessary to abort the
         # commit for jars that began it, but it is harmless to abort it


=== ZODB3/ZODB/fspack.py 1.8.8.8 => 1.8.8.9 ===
--- ZODB3/ZODB/fspack.py:1.8.8.8	Thu May 13 15:50:45 2004
+++ ZODB3/ZODB/fspack.py	Wed Jun  9 14:42:08 2004
@@ -900,4 +900,3 @@
         if self._lock_counter % 20 == 0:
             self._commit_lock_acquire()
         return ipos
-