Commit 2458a7fa authored by Tres Seaver's avatar Tres Seaver

Don't publish acquired attributes if acquired object has no docstring.

See https://bugs.launchpad.net/zope2/+bug/713253/
parent 3bd76737
...@@ -5,12 +5,15 @@ This file contains change information for the current Zope release. ...@@ -5,12 +5,15 @@ This file contains change information for the current Zope release.
Change information for previous versions of Zope can be found at Change information for previous versions of Zope can be found at
http://docs.zope.org/zope2/releases/. http://docs.zope.org/zope2/releases/.
2.12.15 (unreleased) 2.12.15 (2011-02-04)
-------------------- --------------------
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
- LP #713253: Prevent publication of acquired attributes, where the acquired
object does not have a docstring.
- Fix `LazyMap` to avoid unnecessary function calls. - Fix `LazyMap` to avoid unnecessary function calls.
2.12.14 (2010-12-07) 2.12.14 (2010-12-07)
......
...@@ -16,7 +16,7 @@ import os ...@@ -16,7 +16,7 @@ import os
from setuptools import setup, find_packages, Extension from setuptools import setup, find_packages, Extension
setup(name='Zope2', setup(name='Zope2',
version='2.12.15dev', version='2.12.15',
url='http://www.zope.org', url='http://www.zope.org',
license='ZPL 2.1', license='ZPL 2.1',
description='Zope2 application server / web framework', description='Zope2 application server / web framework',
......
...@@ -120,11 +120,11 @@ class DefaultPublishTraverse(object): ...@@ -120,11 +120,11 @@ class DefaultPublishTraverse(object):
# Again, clear any error status created by __bobo_traverse__ # Again, clear any error status created by __bobo_traverse__
# because we actually found something: # because we actually found something:
request.response.setStatus(200) request.response.setStatus(200)
return subobject
except AttributeError: except AttributeError:
pass pass
# Lastly we try with key access: # Lastly we try with key access:
if subobject is None:
try: try:
subobject = object[name] subobject = object[name]
except TypeError: # unsubscriptable except TypeError: # unsubscriptable
...@@ -135,8 +135,6 @@ class DefaultPublishTraverse(object): ...@@ -135,8 +135,6 @@ class DefaultPublishTraverse(object):
# object has a pseudo-docstring for the object. Objects that # object has a pseudo-docstring for the object. Objects that
# have an empty or missing docstring are not published. # have an empty or missing docstring are not published.
doc = getattr(subobject, '__doc__', None) doc = getattr(subobject, '__doc__', None)
if doc is None:
doc = getattr(object, '%s__doc__' % name, None)
if not doc: if not doc:
raise Forbidden( raise Forbidden(
"The object at %s has an empty or missing " \ "The object at %s has an empty or missing " \
......
...@@ -304,6 +304,14 @@ class TestBaseRequest(unittest.TestCase, BaseRequest_factory): ...@@ -304,6 +304,14 @@ class TestBaseRequest(unittest.TestCase, BaseRequest_factory):
r = self._makeOne(root) r = self._makeOne(root)
self.assertRaises(NotFound, r.traverse, 'folder/objBasic/noview') self.assertRaises(NotFound, r.traverse, 'folder/objBasic/noview')
def test_traverse_acquired_attribute_without_docstring(self):
from ZPublisher import NotFound
root, folder = self._makeRootAndFolder()
root._setObject('objBasic',
self._makeObjectWithEmptyDocstring())
r = self._makeOne(root)
self.assertRaises(NotFound, r.traverse, 'folder/objBasic')
def test_traverse_class_without_docstring(self): def test_traverse_class_without_docstring(self):
from ZPublisher import NotFound from ZPublisher import NotFound
root, folder = self._makeRootAndFolder() root, folder = self._makeRootAndFolder()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment