[Checkins] SVN: grok/trunk/ Depend on grokcore.site and adjust tests and imports accordingly.

[Jan-Jaap Driessen]

Log message for revision 118777:
  Depend on grokcore.site and adjust tests and imports accordingly.

Changed:
  U   grok/trunk/buildout.cfg
  U   grok/trunk/src/grok/components.py
  U   grok/trunk/src/grok/events.py
  U   grok/trunk/src/grok/ftests/application/application.py
  U   grok/trunk/src/grok/meta.py
  U   grok/trunk/src/grok/tests/application/application.py
  U   grok/trunk/src/grok/util.py

-=-
Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/buildout.cfg	2010-12-09 21:17:27 UTC (rev 118777)
@@ -14,7 +14,12 @@
     grokwiki
 versions = versions
 extensions = buildout.dumppickedversions
+             mr.developer
+auto-checkout = grokcore.site
 
+[sources]
+grokcore.site = svn http://svn.zope.org/repos/main/grokcore.site/trunk
+
 [versions]
 grok =
 

Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/components.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -56,7 +56,7 @@
     their Zope database.
 
     """
-    interface.implements(interfaces.IApplication)
+    interface.implements(grokcore.site.interfaces.IApplication)
 
 
 class View(grokcore.view.View):

Modified: grok/trunk/src/grok/events.py
===================================================================
--- grok/trunk/src/grok/events.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/events.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -17,15 +17,16 @@
 conveniently provided to be used in your own application.
 
 """
-from grok import interfaces
+import grok.interfaces
+import grokcore.site.interfaces
 from zope.interface import implements
 
 
 class ApplicationInitializedEvent(object):
     """A Grok Application has been created and is now ready to be used.
     """
-    implements(interfaces.IApplicationInitializedEvent)
+    implements(grok.interfaces.IApplicationInitializedEvent)
 
     def __init__(self, app):
-        assert interfaces.IApplication.providedBy(app)
+        assert grokcore.site.interfaces.IApplication.providedBy(app)
         self.object = app

Modified: grok/trunk/src/grok/ftests/application/application.py
===================================================================
--- grok/trunk/src/grok/ftests/application/application.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/ftests/application/application.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -15,14 +15,15 @@
   >>> app = grok.util.create_application(Cave, root, 'mycave')
   >>> root['cave'] = app
   >>> zope.site.hooks.setSite(app)
-  >>> grok.getApplication()
+  >>> import grokcore.site
+  >>> grokcore.site.getApplication()
   <grok.ftests.application.application.Cave object at ...>
-  
+
 Or get it using grok.getSite():
 
   >>> grok.getSite()
   <grok.ftests.application.application.Cave object at ...>
-  
+
 Now we can create a container with a sub-site. When we call grok.getSite()
 we'll get the box:
 
@@ -30,10 +31,10 @@
   >>> zope.site.hooks.setSite(root['cave']['box'])
   >>> grok.getSite()
   <grok.ftests.application.application.WoodBox object at ...>
-  
+
 But when we call grok.getApplication() we get the cave:
-  
-  >>> grok.getApplication()
+
+  >>> grokcore.site.getApplication()
   <grok.ftests.application.application.Cave object at ...>
 
 """

Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/meta.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -266,7 +266,7 @@
 
     def grok(self, name, factory, module_info, config, **kw):
         # XXX fail loudly if the same application name is used twice.
-        provides = grok.interfaces.IApplication
+        provides = grokcore.site.interfaces.IApplication
         name = '%s.%s' % (module_info.dotted_name, name)
         config.action(
             discriminator=('utility', provides, name),

Modified: grok/trunk/src/grok/tests/application/application.py
===================================================================
--- grok/trunk/src/grok/tests/application/application.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/tests/application/application.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -5,8 +5,8 @@
 
     >>> grok.testing.grok(__name__)
     >>> import zope.component
-    >>> import grok.interfaces
-    >>> calendar_app = zope.component.getUtility(grok.interfaces.IApplication,
+    >>> import grokcore.site.interfaces
+    >>> calendar_app = zope.component.getUtility(grokcore.site.interfaces.IApplication,
     ...                                          name='grok.tests.application.application.Calendar')
     >>> calendar_app
     <class 'grok.tests.application.application.Calendar'>

Modified: grok/trunk/src/grok/util.py
===================================================================
--- grok/trunk/src/grok/util.py	2010-12-09 21:16:31 UTC (rev 118776)
+++ grok/trunk/src/grok/util.py	2010-12-09 21:17:27 UTC (rev 118777)
@@ -14,7 +14,7 @@
 """Grok utility functions.
 """
 import grok
-import grok.interfaces
+import grokcore.site.interfaces
 import zope.location.location
 
 from zope import interface
@@ -60,7 +60,7 @@
     the application lifecycle.
     """
     # Check the factory.
-    if not grok.interfaces.IApplication.implementedBy(factory):
+    if not grokcore.site.interfaces.IApplication.implementedBy(factory):
         raise WrongType(factory)
 
     # Check the availability of the name in the container.