Log message for revision 39891: - removed fallback isAnObjectManager check
Changed: U Zope/trunk/doc/CHANGES.txt UU Zope/trunk/lib/python/OFS/PropertySheets.py -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2005-11-04 16:10:27 UTC (rev 39890) +++ Zope/trunk/doc/CHANGES.txt 2005-11-04 16:59:20 UTC (rev 39891) @@ -73,6 +73,12 @@ - Improved test runner. Run test.py with -h to find out more. + Bugs Fixed + + - OFS PropertySheets / webdav: Fixed dav__resourcetype. + __dav_collection__ with a false value was overridden by + isAnObjectManager. + Other - ZSQLMethod.manage_main: Moved the error message that warns of a Modified: Zope/trunk/lib/python/OFS/PropertySheets.py =================================================================== --- Zope/trunk/lib/python/OFS/PropertySheets.py 2005-11-04 16:10:27 UTC (rev 39890) +++ Zope/trunk/lib/python/OFS/PropertySheets.py 2005-11-04 16:59:20 UTC (rev 39891) @@ -7,7 +7,7 @@ # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE +# FOR A PARTICULAR PURPOSE. # ############################################################################## """Property sheets @@ -533,8 +533,7 @@ def dav__resourcetype(self): vself=self.v_self() - if (isDavCollection(vself) or - getattr(aq_base(vself), 'isAnObjectManager', None)): + if isDavCollection(vself): return '<n:collection/>' return '' Property changes on: Zope/trunk/lib/python/OFS/PropertySheets.py ___________________________________________________________________ Name: cvs2svn:cvs-rev - 1.95 _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins