[Checkins] SVN: grok/trunk/s update all usage of zope.app.component to use zope.site instead, remove zope.app.component from install_requires
Kevin Teague
kevin at bud.ca
Thu Nov 26 19:23:26 EST 2009
Log message for revision 106049:
update all usage of zope.app.component to use zope.site instead, remove zope.app.component from install_requires
Changed:
U grok/trunk/setup.py
U grok/trunk/src/grok/ftests/catalog/catalog.py
U grok/trunk/src/grok/ftests/catalog/indexes.py
U grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py
U grok/trunk/src/grok/ftests/catalog/indexes_attribute.py
U grok/trunk/src/grok/ftests/catalog/indexes_class.py
U grok/trunk/src/grok/ftests/catalog/indexes_multiple.py
U grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
U grok/trunk/src/grok/ftests/catalog/indexes_name.py
U grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py
U grok/trunk/src/grok/ftests/catalog/indexes_set.py
U grok/trunk/src/grok/ftests/catalog/indexes_site.py
U grok/trunk/src/grok/ftests/catalog/setuporder.py
U grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py
U grok/trunk/src/grok/ftests/security/preserve_permissions.py
-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/setup.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -50,7 +50,6 @@
'zope.app.appsetup',
'zope.app.authentication',
'zope.app.catalog',
- 'zope.app.component',
'zope.app.container',
'zope.app.folder',
'zope.app.intid',
Modified: grok/trunk/src/grok/ftests/catalog/catalog.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/catalog.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/catalog.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -3,7 +3,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site:
Modified: grok/trunk/src/grok/ftests/catalog/indexes.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -6,7 +6,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -7,7 +7,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
We are able to find the catalog::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_attribute.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_attribute.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_attribute.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -8,7 +8,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_class.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_class.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_class.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -7,7 +7,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -7,7 +7,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
We are able to query the catalog::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -12,7 +12,7 @@
...
KeyError: u'name'
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
>>> from zope.app.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
Modified: grok/trunk/src/grok/ftests/catalog/indexes_name.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -7,7 +7,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
>>> from zope.app.catalog.interfaces import ICatalog
Modified: grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -18,7 +18,7 @@
Nuke the catalog and intids in the end, so as not to confuse
other tests::
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
>>> from zope.app.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
Modified: grok/trunk/src/grok/ftests/catalog/indexes_set.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_set.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_set.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -5,7 +5,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site::
Modified: grok/trunk/src/grok/ftests/catalog/indexes_site.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_site.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/indexes_site.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -7,7 +7,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
The catalog is there in the site::
Modified: grok/trunk/src/grok/ftests/catalog/setuporder.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/setuporder.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/catalog/setuporder.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -6,7 +6,7 @@
>>> herd = Herd()
>>> getRootFolder()['herd'] = herd
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(herd)
Now we add some indexable objects to the site:
Modified: grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py
===================================================================
--- grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -57,7 +57,7 @@
from zope.schema import TextLine
from zope.interface import Interface
from zope.component import queryUtility
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from zope.app.catalog.interfaces import ICatalog
Modified: grok/trunk/src/grok/ftests/security/preserve_permissions.py
===================================================================
--- grok/trunk/src/grok/ftests/security/preserve_permissions.py 2009-11-27 00:15:31 UTC (rev 106048)
+++ grok/trunk/src/grok/ftests/security/preserve_permissions.py 2009-11-27 00:23:25 UTC (rev 106049)
@@ -33,7 +33,7 @@
``contents.html`` view for site folders. For this we make it provide
`ISiteManagementFolder`::
- >>> from zope.app.component.interfaces import ISiteManagementFolder
+ >>> from zope.site.interfaces import ISiteManagementFolder
>>> from zope.interface import alsoProvides
>>> alsoProvides(root['app'], ISiteManagementFolder)
More information about the checkins
mailing list