[Zope-Checkins] CVS: Zope3/lib/python/Transaction - _defaultTransaction.py:1.1.2.4

Jeremy Hylton jeremy@zope.com
Fri, 29 Mar 2002 15:47:45 -0500


Update of /cvs-repository/Zope3/lib/python/Transaction
In directory cvs.zope.org:/tmp/cvs-serv28127

Modified Files:
      Tag: Zope-3x-branch
	_defaultTransaction.py 
Log Message:
Add a little whitespace.


=== Zope3/lib/python/Transaction/_defaultTransaction.py 1.1.2.3 => 1.1.2.4 ===
                                 # we need to save it away to be committed in
                                 # the outer transaction.
-                                try: j.tpc_begin(self, subtransaction)
+                                try:
+                                    j.tpc_begin(self, subtransaction)
                                 except TypeError:
                                     j.tpc_begin(self)
 
                                 if hasattr(j, 'commit_sub'):
-                                    subj[i]=j
+                                    subj[i] = j
                                 else:
                                     if self._non_st_objects is None:
                                         self._non_st_objects = []
@@ -228,8 +229,8 @@
 
                             else:
                                 j.tpc_begin(self)
-                        j.commit(o,self)
-                    ncommitted=ncommitted+1
+                        j.commit(o, self)
+                    ncommitted = ncommitted+1
 
                 # Commit work done in subtransactions
                 while subjars:
@@ -237,15 +238,12 @@
                     i=id(j)
                     if not jars.has_key(i):
                         jars[i]=j
-                    
                     j.commit_sub(self)
 
                 jarsv = jars.values()
                 for jar in jarsv:
                     if not subtransaction:
-                        try: jar=jar.tpc_vote
-                        except: pass
-                        else: jar(self) # last chance to bail
+                        jar.tpc_vote(self)
 
                 try:
                     # Try to finish one jar, since we may be able to