[Checkins] SVN: grokcore.layout/trunk/src/grokcore/layout/ Remove application_url

Sylvain Viollon sylvain at infrae.com
Wed Jul 13 13:05:18 EDT 2011


Log message for revision 122182:
  Remove application_url
  

Changed:
  U   grokcore.layout/trunk/src/grokcore/layout/components.py
  D   grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py

-=-
Modified: grokcore.layout/trunk/src/grokcore/layout/components.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/components.py	2011-07-13 17:03:17 UTC (rev 122181)
+++ grokcore.layout/trunk/src/grokcore/layout/components.py	2011-07-13 17:05:17 UTC (rev 122182)
@@ -12,23 +12,9 @@
 from zope.publisher.publish import mapply
 import zope.interface.common.interfaces
 import zope.errorview.browser
-from zope.component.hooks import getSite
 
 
-class UtilityView(object):
-    """A view mixin with useful methods.
-    """
-
-    def application_url(self, name=None):
-        """Return the URL of the nearest site.
-        """
-        site = getSite()
-        if site is None:
-            raise zope.component.ComponentLookupError("No site found.")
-        return self.url(site, name)
-
-
-class Layout(grokcore.view.ViewSupport, UtilityView):
+class Layout(grokcore.view.ViewSupport):
     """A layout object.
     """
     grok.baseclass()
@@ -75,7 +61,7 @@
         return self.render()
 
 
-class LayoutAware(UtilityView):
+class LayoutAware(object):
     """A mixin to make views aware of layouts.
     """
     grok.baseclass()

Deleted: grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py	2011-07-13 17:03:17 UTC (rev 122181)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/url.py	2011-07-13 17:05:17 UTC (rev 122182)
@@ -1,57 +0,0 @@
-"""
-  >>> from zope.component.hooks import getSite
-
-  >>> site = getSite()
-  >>> site
-  <zope.site.folder.Folder object at ...>
-
-  >>> helmut = site['helmut'] = Panda()
-
-  >>> from zope.component import getMultiAdapter
-  >>> from zope.publisher.browser import TestRequest
-  >>> request = TestRequest()
-  >>> view = getMultiAdapter((helmut, request), name='index')
-  >>> view
-  <grokcore.layout.tests.models.url.Index object at ...>
-
-  >>> print view.application_url()
-  http://127.0.0.1
-
-  >>> form = getMultiAdapter((helmut, request), name='form')
-  >>> form
-  <grokcore.layout.tests.models.url.BearForm object at ...>
-
-  >>> print form.application_url()
-  http://127.0.0.1
-
-"""
-
-import grokcore.view as grok
-from grokcore.layout import Page, Layout, Form
-from zope.interface import Interface, implements
-
-grok.templatedir("templates")
-
-
-class IBear(Interface):
-    pass
-
-
-class Panda(grok.Context):
-    implements(IBear)
-
-
-class Master(Layout):
-    grok.context(IBear)
-
-
-class BearForm(Form):
-    grok.name('form')
-    grok.context(IBear)
-    
-
-class Index(Page):
-    grok.context(IBear)
-
-    def render(self):
-        return u"A view"



More information about the checkins mailing list