[Checkins] SVN: grokcore.registries/trunk/s Removed grokcore.site, tests now use plain Components (not persistent to avoid the ZODB3 dependencies)

[Souheil Chelfouh]

Log message for revision 127461:
  Removed grokcore.site, tests now use plain Components (not persistent to avoid the ZODB3 dependencies)

Changed:
  U   grokcore.registries/trunk/setup.py
  U   grokcore.registries/trunk/src/grokcore/registries/README.txt
  U   grokcore.registries/trunk/src/grokcore/registries/configure.zcml
  U   grokcore.registries/trunk/src/grokcore/registries/ftesting.zcml
  U   grokcore.registries/trunk/src/grokcore/registries/ftests/registries/grok_integration.py

-=-
Modified: grokcore.registries/trunk/setup.py
===================================================================
--- grokcore.registries/trunk/setup.py	2012-08-09 13:51:24 UTC (rev 127460)
+++ grokcore.registries/trunk/setup.py	2012-08-09 14:04:00 UTC (rev 127461)
@@ -15,7 +15,6 @@
 
 tests_require = [
     'grokcore.component',
-    'grokcore.site',
     'zope.testing',
     ]
 

Modified: grokcore.registries/trunk/src/grokcore/registries/README.txt
===================================================================
--- grokcore.registries/trunk/src/grokcore/registries/README.txt	2012-08-09 13:51:24 UTC (rev 127460)
+++ grokcore.registries/trunk/src/grokcore/registries/README.txt	2012-08-09 14:04:00 UTC (rev 127461)
@@ -68,7 +68,6 @@
   ... <configure i18n_domain="zope">
   ...   <include package="zope.component" file="meta.zcml" />
   ...   <include package="grokcore.registries" file="meta.zcml" />
-  ...   <include package="grokcore.site" />
   ... </configure>
   ... ''')
 
@@ -103,11 +102,6 @@
 
 Now we use our ´custom´ one:
 
-  >>> custom.getUtility(IExample, name="global")
-  Traceback (most recent call last):
-  ...
-  ComponentLookupError: (<InterfaceClass grokcore.registries.tests.registries.interfaces.IExample>, 'global')
-
   >>> custom.getUtility(IExample, name="local")
   <grokcore.registries.tests.registries.local.MyExample object at ...>
 
@@ -115,19 +109,12 @@
 Using BaseRegistries (Stacked Registries)
 -----------------------------------------
 
-  >>> from grokcore.site import Application
-  >>> site = Application()
-  >>> from zope.site.site import LocalSiteManager
-  >>> site.setSiteManager(LocalSiteManager(site))
-  >>> sm = site.getSiteManager()
+  >>> from zope.component.registry import Components
+  >>> sm = Components()
 
   >>> sm.__bases__
-  (<BaseGlobalComponents base>,)
+  ()
 
-
-  >>> sm.getUtility(IExample, name="global")
-  <grokcore.registries.tests.registries.global.MyExample object at 0...>
-
   >>> sm.getUtility(IExample, name="local")
   Traceback (most recent call last):
   ...
@@ -137,10 +124,7 @@
 
   >>> sm.__bases__ += (custom,)
   >>> sm.__bases__
-  (<BaseGlobalComponents base>, <BaseComponents custom>)
+  (<BaseComponents custom>,)
 
-  >>> sm.getUtility(IExample, name="global")
-  <grokcore.registries.tests.registries.global.MyExample object at 0...>
-
   >>> sm.getUtility(IExample, name="local")
   <grokcore.registries.tests.registries.local.MyExample object at 0...>

Modified: grokcore.registries/trunk/src/grokcore/registries/configure.zcml
===================================================================
--- grokcore.registries/trunk/src/grokcore/registries/configure.zcml	2012-08-09 13:51:24 UTC (rev 127460)
+++ grokcore.registries/trunk/src/grokcore/registries/configure.zcml	2012-08-09 14:04:00 UTC (rev 127461)
@@ -1,9 +1,7 @@
 <configure
   xmlns="http://namespaces.zope.org/zope"
-  xmlns:browser="http://namespaces.zope.org/browser"
   xmlns:grok="http://namespaces.zope.org/grok">
 
-  <include package="grokcore.site" />
-  <include package="." file="meta.zcml" />
+  <include file="meta.zcml" />
 
 </configure>

Modified: grokcore.registries/trunk/src/grokcore/registries/ftesting.zcml
===================================================================
--- grokcore.registries/trunk/src/grokcore/registries/ftesting.zcml	2012-08-09 13:51:24 UTC (rev 127460)
+++ grokcore.registries/trunk/src/grokcore/registries/ftesting.zcml	2012-08-09 14:04:00 UTC (rev 127461)
@@ -4,6 +4,7 @@
    i18n_domain="grokcore.registries"
    package="grokcore.registries">
 
+  <include package="grokcore.component" file="meta.zcml" />
   <include package="grokcore.registries" file="meta.zcml" />
   <include package="grokcore.registries" />
 

Modified: grokcore.registries/trunk/src/grokcore/registries/ftests/registries/grok_integration.py
===================================================================
--- grokcore.registries/trunk/src/grokcore/registries/ftests/registries/grok_integration.py	2012-08-09 13:51:24 UTC (rev 127460)
+++ grokcore.registries/trunk/src/grokcore/registries/ftests/registries/grok_integration.py	2012-08-09 14:04:00 UTC (rev 127461)
@@ -27,14 +27,14 @@
 
 """
 
-from zope.component.persistentregistry import PersistentComponents
+from zope.component.registry import Components
 from grokcore.registries.ftests.registries.basic import specialRegistry
 
 
 class MyApplication(object):
 
     def __init__(self):
-        self._sm = PersistentComponents()
+        self._sm = Components()
 
     def getSiteManager(self):
         current = self._sm