[Checkins] SVN: Products.CMF - use BrowserView from zope.publisher
Yvo Schubbe
cvs-admin at zope.org
Wed Jul 11 19:33:01 UTC 2012
Log message for revision 127332:
- use BrowserView from zope.publisher
- removed unused MacroView class
Changed:
U Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/icons.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2012-07-11 19:25:03 UTC (rev 127331)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DynamicType.py 2012-07-11 19:32:58 UTC (rev 127332)
@@ -19,11 +19,11 @@
from StringIO import StringIO
from Acquisition import Implicit
-from Products.Five.browser import BrowserView
from zope.component import getSiteManager
from zope.component import provideAdapter
from zope.interface import alsoProvides
from zope.interface.verify import verifyClass
+from zope.publisher.browser import BrowserView
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IBrowserView
try:
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2012-07-11 19:25:03 UTC (rev 127331)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2012-07-11 19:32:58 UTC (rev 127332)
@@ -19,7 +19,6 @@
from Acquisition import aq_inner
from Acquisition import aq_parent
from DateTime import DateTime
-from Products.Five import BrowserView
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zExceptions import Forbidden
from zExceptions import Redirect
@@ -29,6 +28,7 @@
from zope.formlib.widgets import TextWidget
from zope.interface import implements
from zope.interface import Interface
+from zope.publisher.browser import BrowserView
from zope.schema import Bool
from zope.schema import Choice
from zope.schema import Password
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/icons.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/icons.py 2012-07-11 19:25:03 UTC (rev 127331)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/skins/icons.py 2012-07-11 19:32:58 UTC (rev 127332)
@@ -17,8 +17,8 @@
LOG = getLogger("Action Icons CSS")
-from Products.Five import BrowserView
from zope.component import getUtility
+from zope.publisher.browser import BrowserView
from Products.CMFCore.Expression import getExprContext
from Products.CMFCore.interfaces import IActionsTool
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2012-07-11 19:25:03 UTC (rev 127331)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/utils.py 2012-07-11 19:32:58 UTC (rev 127332)
@@ -13,16 +13,13 @@
"""Browser view utilities.
"""
-from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import InitializeClass
-from Products.Five import BrowserView
+from zope.publisher.browser import BrowserView
from zope.component import getUtility
from Products.CMFCore.interfaces import IMembershipTool
from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFCore.interfaces import IURLTool
from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.permissions import View
from Products.CMFDefault.utils import getBrowserCharset
from Products.CMFDefault.utils import toUnicode
@@ -43,24 +40,6 @@
return memoized_meth
-class MacroView(BrowserView):
-
- """Allows to use macros from non-view templates.
- """
-
- # The following allows to traverse the view/class and reach
- # macros defined in page templates, e.g. in a use-macro.
- security = ClassSecurityInfo()
-
- def _macros(self):
- return self.index.macros
-
- security.declareProtected(View, 'macros')
- macros = property(_macros, None, None)
-
-InitializeClass(MacroView)
-
-
class ViewBase(BrowserView):
# helpers
More information about the checkins
mailing list