[Checkins] SVN: grok/branches/grokcore.xxx/ rename ViewMixin,
actually derives from BrowserPage
Godefroid Chapelle
gotcha at bubblenet.be
Fri Jul 18 10:56:29 EDT 2008
Log message for revision 88515:
rename ViewMixin, actually derives from BrowserPage
Changed:
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/meta.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py
U grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
U grok/branches/grokcore.xxx/src/grok/components.py
U grok/branches/grokcore.xxx/src/grok/meta.py
-=-
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/__init__.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -1,5 +1,5 @@
from directive import layer, view, require, template, templatedir
from util import url
-from components import ViewMixin, Permission, GrokForm, Skin
+from components import GrokView, Permission, GrokForm, Skin
from components import PageTemplate, PageTemplateFile
from components import IGrokLayer
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/components.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -4,6 +4,7 @@
from zope import component
from zope import interface
from zope.publisher.publish import mapply
+from zope.publisher.browser import BrowserPage
from zope.security.permission import Permission
from zope.pagetemplate import pagetemplate, pagetemplatefile
from zope.app.pagetemplate.engine import TrustedAppPT
@@ -28,18 +29,16 @@
pass
-#XXX rename to GrokView
-class ViewMixin(object):
+class GrokView(BrowserPage):
def __init__(self, context, request):
- super(ViewMixin, self).__init__(context, request)
+ super(GrokView, self).__init__(context, request)
self.__name__ = self.__view_name__
self.static = component.queryAdapter(
self.request,
interface.Interface,
- name=self.module_info.package_dotted_name
- )
-
+ name=self.module_info.package_dotted_name)
+
def _update_and_render(self):
mapply(self.update, (), self.request)
if self.request.response.getStatus() in (302, 303):
@@ -70,7 +69,7 @@
if template is not None:
return self._render_template()
return mapply(self.render, (), self.request)
-
+
def url(self, obj=None, name=None, data=None):
"""Return string for the URL based on the obj and name. The data
argument is used to form a CGI query string.
@@ -114,7 +113,7 @@
namespace['static'] = self.static
namespace['view'] = self
return namespace
-
+
def application_url(self, name=None):
raise NotImplementedError
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -1,7 +1,6 @@
import warnings
from zope import interface
-from zope.publisher.browser import BrowserPage
from grokcore.component.interfaces import IContext
@@ -13,12 +12,8 @@
interface.implements(IContext)
-class View(BrowserPage, grokcore.view.ViewMixin):
+class View(grokcore.view.GrokView):
- def __init__(self, context, request):
- BrowserPage.__init__(self, context, request)
- grokcore.view.ViewMixin.__init__(self, context, request)
-
def __call__(self):
return self._update_and_render()
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/meta.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/meta.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/meta.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -40,7 +40,7 @@
class ViewGrokker(ViewGrokkerBase):
- martian.component(grokcore.view.ViewMixin)
+ martian.component(grokcore.view.GrokView)
def protectName(self, config, factory, permission):
config.action(
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/inline_unassociated.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -2,10 +2,9 @@
Inline templates that are not associated with a view class will
provoke an error:
- >>> from grok.testing import warn
>>> import warnings
>>> saved_warn = warnings.warn
- >>> warnings.warn = warn
+ >>> warnings.warn = grok.testing.warn
>>> grok.testing.grok(__name__)
From grok.testing's warn():
Modified: grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py
===================================================================
--- grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/view/modequalspkgname/modequalspkgname.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -3,9 +3,11 @@
resides in. Grokking it should not provoke an `unassociated template`
error or warning.
"""
-import grok
+from grokcore.view.tests import grok
+
class Cave(grok.Model):
pass
+
class Index(grok.View):
pass # see modequalspkgname_templates
Modified: grok/branches/grokcore.xxx/src/grok/components.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/components.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/src/grok/components.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -142,13 +142,9 @@
# self.context = context
# self.request = request
-class View(BrowserPage, grokcore.view.ViewMixin):
+class View(grokcore.view.GrokView):
interface.implements(interfaces.IGrokView)
- def __init__(self, context, request):
- BrowserPage.__init__(self, context, request)
- grokcore.view.ViewMixin.__init__(self, context, request)
-
def __call__(self):
return self._update_and_render()
Modified: grok/branches/grokcore.xxx/src/grok/meta.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/meta.py 2008-07-18 14:40:17 UTC (rev 88514)
+++ grok/branches/grokcore.xxx/src/grok/meta.py 2008-07-18 14:56:28 UTC (rev 88515)
@@ -140,7 +140,7 @@
class ViewGrokker(ViewGrokkerBase):
- martian.component(grokcore.view.ViewMixin)
+ martian.component(grokcore.view.GrokView)
def protectName(self, config, factory, permission):
config.action(
More information about the Checkins
mailing list