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

[Shane Hathaway]

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

Modified Files:
      Tag: Zope-3x-branch
	BaseResponse.py Exceptions.py mapply.py 
Log Message:
- Fixed exception imports.
- Fixed mapply() to work with a first arg.


=== Zope3/lib/python/Zope/Publisher/BaseResponse.py 1.1.2.5 => 1.1.2.6 ===
 __version__='$Revision$'[11:-2]
 
-from Zope.zExceptions import Unauthorized
+from Exceptions import Unauthorized
 
 class BaseResponse:
     """Base Response Class


=== Zope3/lib/python/Zope/Publisher/Exceptions.py 1.1.2.7 => 1.1.2.8 ===
 
 
-from Zope.zExceptions import Unauthorized
+from Zope.Exceptions import Unauthorized
 
 
 class PublishingException (Exception):


=== Zope3/lib/python/Zope/Publisher/mapply.py 1.1.2.5 => 1.1.2.6 ===
         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
         else:
             raise TypeError, "mapply() can not call %s" % `object`
 
     return unwrapped, wrapperCount
 
 def mapply(object, positional=(), keyword={}, call=apply):
-
+    __traceback_info__ = object
     unwrapped, wrapperCount = unwrapMethod( object )
     code = unwrapped.func_code
     defaults = unwrapped.func_defaults