[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - Publish.py:1.164.2.3

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv8057

Modified Files:
      Tag: Zope-2_7-branch
	Publish.py 
Log Message:
Reformat whitespace in preparation for a real change.


=== Zope/lib/python/ZPublisher/Publish.py 1.164.2.2 => 1.164.2.3 ===
--- Zope/lib/python/ZPublisher/Publish.py:1.164.2.2	Mon Nov 17 17:34:19 2003
+++ Zope/lib/python/ZPublisher/Publish.py	Sun May 23 01:36:46 2004
@@ -13,7 +13,6 @@
 __doc__="""Python Object Publisher -- Publish Python objects on web servers
 
 $Id$"""
-__version__='$Revision$'[11:-2]
 
 import sys, os
 from Response import Response
@@ -74,7 +73,8 @@
                 raise Redirect, cancel
 
         after_list[0]=bobo_after
-        if debug_mode: response.debug_mode=debug_mode
+        if debug_mode:
+            response.debug_mode=debug_mode
         if realm and not request.get('REMOTE_USER',None):
             response.realm=realm
 
@@ -86,7 +86,8 @@
 
         request['PARENTS']=parents=[object]
 
-        if transactions_manager: transactions_manager.begin()
+        if transactions_manager:
+            transactions_manager.begin()
 
         object=request.traverse(path, validated_hook=validated_hook)
 
@@ -99,13 +100,16 @@
                       dont_publish_class,
                       request, bind=1)
 
-        if result is not response: response.setBody(result)
+        if result is not response:
+            response.setBody(result)
 
-        if transactions_manager: transactions_manager.commit()
+        if transactions_manager:
+            transactions_manager.commit()
 
         return response
     except:
-        if transactions_manager: transactions_manager.abort()
+        if transactions_manager:
+            transactions_manager.abort()
 
         # DM: provide nicer error message for FTP
         sm = None
@@ -115,11 +119,13 @@
         if sm is not None:
             from asyncore import compact_traceback
             cl,val= sys.exc_info()[:2]
-            sm('%s: %s %s' % (getattr(cl,'__name__',cl), val, debug_mode and compact_traceback()[-1] or ''))
-         
+            sm('%s: %s %s' % (
+                getattr(cl,'__name__',cl), val,
+                debug_mode and compact_traceback()[-1] or ''))
 
         if err_hook is not None:
-            if parents: parents=parents[0]
+            if parents:
+                parents=parents[0]
             try:
                 return err_hook(parents, request,
                                 sys.exc_info()[0],
@@ -141,7 +147,8 @@
                 finally:
                     newrequest.close()
 
-        else: raise
+        else:
+            raise
 
 
 def publish_module_standard(module_name,