[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher - BaseResponse.py:1.1.2.5 mapply.py:1.1.2.5

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher
In directory cvs.zope.org:/tmp/cvs-serv17151

Modified Files:
      Tag: Zope-3x-branch
	BaseResponse.py mapply.py 
Log Message:
Simple publisher tests.


=== Zope3/lib/python/Zope/Publisher/BaseResponse.py 1.1.2.4 => 1.1.2.5 ===
     debug_mode=None
     status = None         # The response status (usually an integer)
+    body = ''
     #_auth=None
     #_error_format='text/plain'
     
@@ -126,3 +127,5 @@
         traceback.print_exception(
             exc_info[0], exc_info[1], exc_info[2], 100, self)
 
+    def setBase(self, url):
+        pass


=== Zope3/lib/python/Zope/Publisher/mapply.py 1.1.2.4 => 1.1.2.5 ===
             # Calling class constructors might be dangerous.
             raise TypeError, "mapply() can not call class constructors"
-        if hasattr( unwrapped, 'func_code' ):
-            break
         if hasattr( unwrapped, 'im_func' ):
             unwrapped = unwrapped.im_func
-            wrapperCount += 1
+            wrapperCount = 1
+        elif hasattr( unwrapped, 'func_code' ):
+            break
         elif hasattr( unwrapped, '__call__' ):
             unwrapped = unwrapped.__call__
-            wrapperCount += 1
+            wrapperCount = 1
         else:
             raise TypeError, "mapply() can not call %s" % `object`