Log message for revision 120152: Applied missing bit of the code merge for LP #713253 (c120128).
Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/ZPublisher/BaseRequest.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst =================================================================== --- Zope/branches/2.13/doc/CHANGES.rst 2011-02-06 18:11:30 UTC (rev 120151) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-02-06 18:15:54 UTC (rev 120152) @@ -11,6 +11,7 @@ Bugs Fixed ++++++++++ +- Applied missing bit of the code merge for LP #713253. 2.13.3 (2011-02-06) ------------------- Modified: Zope/branches/2.13/src/ZPublisher/BaseRequest.py =================================================================== --- Zope/branches/2.13/src/ZPublisher/BaseRequest.py 2011-02-06 18:11:30 UTC (rev 120151) +++ Zope/branches/2.13/src/ZPublisher/BaseRequest.py 2011-02-06 18:15:54 UTC (rev 120152) @@ -140,8 +140,6 @@ # object has a pseudo-docstring for the object. Objects that # have an empty or missing docstring are not published. doc = getattr(subobject, '__doc__', None) - if doc is None: - doc = getattr(object, '%s__doc__' % name, None) if not doc: raise Forbidden( "The object at %s has an empty or missing " \ _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins