[KSS-checkins] r35824 - in kukit/kss.core/trunk: . tests

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Sat Dec 16 00:01:34 2006
New Revision: 35824

Modified:
   kukit/kss.core/trunk/azaxview.py
   kukit/kss.core/trunk/azaxview.txt
   kukit/kss.core/trunk/tests/test_azaxview.py
Log:
Fixed a problem with the tests and the registration of the site manager, it now directly hooks into the component api instead of going through the previously disabled zope.app.component setSite stuff.


Modified: kukit/kss.core/trunk/azaxview.py
==============================================================================
--- kukit/kss.core/trunk/azaxview.py	(original)
+++ kukit/kss.core/trunk/azaxview.py	Sat Dec 16 00:01:34 2006
@@ -41,17 +41,14 @@
 from interfaces import IAzaxEvent, IAzaxView
 from pluginregistry.commandset import getRegisteredCommandSet
 from zope import app, component, interface
-from zope.app.component.hooks import setSite, setHooks
-from zope.app.component.interfaces import ISite, ILocalSiteManager
-from zope.app.component.site import clearSite
+from zope.component import getSiteManager
 from zope.component.globalregistry import BaseGlobalComponents
+from zope.component.persistentregistry import PersistentAdapterRegistry
 from zope.component.interfaces import IComponentLookup
+from zope.component.interfaces import ComponentLookupError
 from zope.event import notify
 from zope.interface import implements, Interface
 from zope.publisher.browser import BrowserView
-from zope.component.persistentregistry import PersistentAdapterRegistry
-from zope.app.component.site import _findNextSiteManager
-from zope.component.interfaces import ComponentLookupError
 
 class ViewSiteManager(BaseGlobalComponents):
 
@@ -62,7 +59,6 @@
 class SiteView(BrowserView):
     """A browser view that is its own site
     """
-    implements(ISite)
 
     def __init__(self, context, request):
         super(SiteView, self).__init__(context, request)
@@ -85,14 +81,12 @@
 
         # register object event handler
         self._sitemanager.registerHandler(wrapped_view._eventRedispatcher)
-        ##setHooks()
-        ##setSite(self)
 
-    def getSiteManager(self):
-        return self._sitemanager
+        # make ourselve the default site manager
+        getSiteManager.sethook(self.getSiteManager)
 
-    def setSiteManager(self, sm):
-        raise NotImplementedError('You can only get the site manager')
+    def getSiteManager(self, context=None):
+        return self._sitemanager
 
     @component.adapter(Interface)
     def _eventRedispatcher(self, event):
@@ -101,7 +95,8 @@
             notify(azaxevent)
 
     def render(self):
-        pass #clearSite()
+        # reset the site manager to its original one
+        getSiteManager.reset()
 
 class AzaxBaseView(SiteView):
     """ Base kss view

Modified: kukit/kss.core/trunk/azaxview.txt
==============================================================================
--- kukit/kss.core/trunk/azaxview.txt	(original)
+++ kukit/kss.core/trunk/azaxview.txt	Sat Dec 16 00:01:34 2006
@@ -25,6 +25,7 @@
   >>> from zope.app.component.interfaces import ISite
   >>> from zope.interface import directlyProvides, directlyProvidedBy
   >>> from zope.publisher.browser import TestRequest
+  >>> import zope.component.event
 
   >>> from zope.app.folder import folder
   >>> myfolder = folder.rootFolder()

Modified: kukit/kss.core/trunk/tests/test_azaxview.py
==============================================================================
--- kukit/kss.core/trunk/tests/test_azaxview.py	(original)
+++ kukit/kss.core/trunk/tests/test_azaxview.py	Sat Dec 16 00:01:34 2006
@@ -39,6 +39,7 @@
 from zope import component
 from Products.Five import zcml
 import Products.Five
+import zope.component.event
 #from zope.app.component.hooks import setSite, getSite, setHooks
 
 def setUpDoctTest(test=None):