Log message for revision 68414:
There must be no warning when __name__ is supplied.
Changed:
U Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplateFile.py
-=-
Modified:
Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplateFile.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplateFile.py
2006-05-31 17:36:17 UTC (rev 68413)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/PageTemplateFile.py
2006-05-31 17:59:21 UTC (rev 68414)
@@ -59,15 +59,13 @@
_default_bindings = {'name_subpath': 'traverse_subpath'}
def __init__(self, filename, _prefix=None, **kw):
- name = None
- if kw.has_key('__name__'):
- name = kw['__name__']
- del kw['__name__']
+ name = kw.pop('__name__', None)
basepath, ext = os.path.splitext(filename)
if name:
self.id = self.__name__ = name
+ self._need__name__ = 0
else:
self.id = self.__name__ = os.path.basename(basepath)
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
