[Checkins] SVN: grok/branches/grokcore.xxx/ fix after cleanup for five.grok

[Godefroid Chapelle]

Log message for revision 88507:
  fix after cleanup for five.grok

Changed:
  U   grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py
  U   grok/branches/grokcore.xxx/src/grok/components.py

-=-
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 13:46:10 UTC (rev 88506)
+++ grok/branches/grokcore.xxx/devel/grokcore.view/src/grokcore/view/tests/components.py	2008-07-18 13:50:41 UTC (rev 88507)
@@ -16,20 +16,12 @@
 class View(BrowserPage, grokcore.view.ViewMixin):
 
     def __init__(self, context, request):
-        super(View, self).__init__(context, request)
-        self._initialize()
+        BrowserPage.__init__(self, context, request)
+        grokcore.view.ViewMixin.__init__(self, context, request)
 
     def __call__(self):
         return self._update_and_render()
 
-    def default_namespace(self):
-        namespace = {}
-        namespace['context'] = self.context
-        namespace['request'] = self.request
-        namespace['static'] = self.static
-        namespace['view'] = self
-        return namespace
-
     def __getitem__(self, key):
         # This is BBB code for Zope page templates only:
         if not isinstance(self.template, PageTemplate):

Modified: grok/branches/grokcore.xxx/src/grok/components.py
===================================================================
--- grok/branches/grokcore.xxx/src/grok/components.py	2008-07-18 13:46:10 UTC (rev 88506)
+++ grok/branches/grokcore.xxx/src/grok/components.py	2008-07-18 13:50:41 UTC (rev 88507)
@@ -146,8 +146,8 @@
     interface.implements(interfaces.IGrokView)
 
     def __init__(self, context, request):
-        super(View, self).__init__(context, request)
-        self._initialize()
+        BrowserPage.__init__(self, context, request)
+        grokcore.view.ViewMixin.__init__(self, context, request)
 
     def __call__(self):
         return self._update_and_render()