Log message for revision 79324: Small cleanup Changed: U Zope/branches/philikon-aq/lib/python/Products/Five/viewlet/viewlet.py
-=- Modified: Zope/branches/philikon-aq/lib/python/Products/Five/viewlet/viewlet.py =================================================================== --- Zope/branches/philikon-aq/lib/python/Products/Five/viewlet/viewlet.py 2007-08-28 19:25:24 UTC (rev 79323) +++ Zope/branches/philikon-aq/lib/python/Products/Five/viewlet/viewlet.py 2007-08-28 19:56:54 UTC (rev 79324) @@ -16,17 +16,16 @@ $Id$ """ import os -from zope.viewlet import viewlet as orig_viewlet +import zope.viewlet.viewlet +from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile -from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile - -class ViewletBase(orig_viewlet.ViewletBase): +class ViewletBase(zope.viewlet.viewlet.ViewletBase): pass -class SimpleAttributeViewlet(orig_viewlet.SimpleAttributeViewlet): +class SimpleAttributeViewlet(zope.viewlet.viewlet.SimpleAttributeViewlet): pass -class simple(orig_viewlet.simple): +class simple(zope.viewlet.viewlet.simple): # We need to ensure that the proper __init__ is called. __init__ = ViewletBase.__init__.im_func @@ -39,7 +38,7 @@ # Create the base class hierarchy bases += (simple, ViewletBase) - attrs = {'index' : ZopeTwoPageTemplateFile(template), + attrs = {'index' : ViewPageTemplateFile(template), '__name__' : name} if attributes: attrs.update(attributes) @@ -50,7 +49,7 @@ return class_ -class ResourceViewletBase(orig_viewlet.ResourceViewletBase): +class ResourceViewletBase(zope.viewlet.viewlet.ResourceViewletBase): pass def JavaScriptViewlet(path): @@ -59,13 +58,13 @@ klass = type('JavaScriptViewlet', (ResourceViewletBase, ViewletBase), - {'index': ZopeTwoPageTemplateFile(src), + {'index': ViewPageTemplateFile(src), '_path': path}) return klass -class CSSResourceViewletBase(orig_viewlet.CSSResourceViewletBase): +class CSSResourceViewletBase(zope.viewlet.viewlet.CSSResourceViewletBase): pass def CSSViewlet(path, media="all", rel="stylesheet"): @@ -74,7 +73,7 @@ klass = type('CSSViewlet', (CSSResourceViewletBase, ViewletBase), - {'index': ZopeTwoPageTemplateFile(src), + {'index': ViewPageTemplateFile(src), '_path': path, '_media':media, '_rel':rel}) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins