[Zope3-checkins] SVN: Zope3/trunk/ Fixed issue #387: apidoc and
Cookie
Dmitry Vasiliev
dima at hlabs.spb.ru
Thu Mar 31 06:36:27 EST 2005
Log message for revision 29745:
Fixed issue #387: apidoc and Cookie
Wrong descriptor class has been changed to property()
Changed:
U Zope3/trunk/doc/CHANGES.txt
U Zope3/trunk/src/zope/pagetemplate/pagetemplate.py
-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt 2005-03-31 03:15:24 UTC (rev 29744)
+++ Zope3/trunk/doc/CHANGES.txt 2005-03-31 11:36:27 UTC (rev 29745)
@@ -536,6 +536,8 @@
Bug Fixes
+ - Fixed issue #387: apidoc and Cookie
+
- Fixed issue #334: Failing RuntimeInfo tests
- Fix: Pagelet directive was inoring the permission. Pagelets which
Modified: Zope3/trunk/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/pagetemplate.py 2005-03-31 03:15:24 UTC (rev 29744)
+++ Zope3/trunk/src/zope/pagetemplate/pagetemplate.py 2005-03-31 11:36:27 UTC (rev 29745)
@@ -26,16 +26,10 @@
# Don't use cStringIO here! It's not unicode aware.
from StringIO import StringIO
-import zope.pagetemplate.interfaces
-import zope.interface
+from zope.pagetemplate.interfaces import IPageTemplateSubclassing
+from zope.interface import implements
-class MacroCollection(object):
- def __get__(self, parent, type=None):
- parent._cook_check()
- return parent._v_macros
-
-
_default_options = {}
_error_start = '<!-- Page Template Diagnostics'
@@ -64,8 +58,7 @@
to perform the rendering.
"""
- zope.interface.implements(
- zope.pagetemplate.interfaces.IPageTemplateSubclassing)
+ implements(IPageTemplateSubclassing)
content_type = 'text/html'
expand = 1
@@ -76,8 +69,12 @@
_v_cooked = 0
_text = ''
- macros = MacroCollection()
+ def macros(self):
+ self._cook_check()
+ return self._v_macros
+ macros = property(macros)
+
def pt_edit(self, text, content_type):
if content_type:
self.content_type = str(content_type)
More information about the Zope3-Checkins
mailing list