[Checkins] SVN: grok/trunk/ migrate from zope.app.catalog to zope.catalog
Kevin Teague
kevin at bud.ca
Fri Nov 27 20:51:45 EST 2009
Log message for revision 106072:
migrate from zope.app.catalog to zope.catalog
Changed:
U grok/trunk/setup.py
U grok/trunk/src/grok/configure.zcml
U grok/trunk/src/grok/ftests/catalog/addform.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/index.py
U grok/trunk/src/grok/meta.py
U grok/trunk/versions.cfg
-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/setup.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -49,7 +49,6 @@
'zope.annotation',
'zope.app.appsetup',
'zope.app.authentication',
- 'zope.app.catalog',
'zope.app.container',
'zope.app.folder',
'zope.app.pagetemplate',
@@ -60,6 +59,7 @@
'zope.app.testing',
'zope.app.twisted',
'zope.app.zcmlfiles',
+ 'zope.catalog',
'zope.component',
'zope.configuration',
'zope.dottedname',
Modified: grok/trunk/src/grok/configure.zcml
===================================================================
--- grok/trunk/src/grok/configure.zcml 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/configure.zcml 2009-11-28 01:51:45 UTC (rev 106072)
@@ -22,7 +22,7 @@
<include package="zope.app.authentication" />
<include package="zope.intid" />
<include package="zope.keyreference" />
- <include package="zope.app.catalog" />
+ <include package="zope.catalog" />
<include package="zope.app.renderer" />
<include package="zope.app.session" />
Modified: grok/trunk/src/grok/ftests/catalog/addform.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/addform.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/addform.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -33,11 +33,11 @@
"""
import grok
from zope import schema, interface, component
-from zope.app.intid import IntIds
-from zope.app.intid.interfaces import IIntIds
-from zope.app.catalog.catalog import Catalog
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.catalog.field import FieldIndex
+from zope.intid import IntIds
+from zope.intid.interfaces import IIntIds
+from zope.catalog.catalog import Catalog
+from zope.catalog.interfaces import ICatalog
+from zope.catalog.field import FieldIndex
def setup_catalog(catalog):
catalog['name'] = FieldIndex('name', IMammoth)
Modified: grok/trunk/src/grok/ftests/catalog/catalog.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/catalog.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/catalog.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -13,7 +13,7 @@
Then we are able to query the catalog:
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
>>> catalog = getUtility(ICatalog)
>>> for obj in catalog.searchResults(name=('Ellie', 'Ellie')):
@@ -26,9 +26,9 @@
from zope import schema, interface
from zope.intid import IntIds
from zope.intid.interfaces import IIntIds
-from zope.app.catalog.catalog import Catalog
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.catalog.field import FieldIndex
+from zope.catalog.catalog import Catalog
+from zope.catalog.interfaces import ICatalog
+from zope.catalog.field import FieldIndex
def setup_catalog(catalog):
catalog['name'] = FieldIndex('name', IMammoth)
Modified: grok/trunk/src/grok/ftests/catalog/indexes.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -16,7 +16,7 @@
We are able to query the catalog::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = getUtility(ICatalog)
>>> for obj in catalog.searchResults(name=('Beta', 'Beta')):
@@ -50,7 +50,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_app_interface.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -12,7 +12,7 @@
We are able to find the catalog::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
>>> catalog = getUtility(ICatalog)
>>> catalog is not None
@@ -24,7 +24,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_attribute.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_attribute.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_attribute.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -18,7 +18,7 @@
We are able to query the catalog::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = getUtility(ICatalog)
>>> for obj in catalog.searchResults(how_old=(13, 13)):
@@ -29,7 +29,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_class.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_class.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_class.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -17,7 +17,7 @@
We are able to query the catalog::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
>>> catalog = getUtility(ICatalog)
>>> for obj in catalog.searchResults(name=('Beta', 'Beta')):
@@ -41,7 +41,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -12,7 +12,7 @@
We are able to query the catalog::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = getUtility(ICatalog)
>>> sorted(catalog.keys())
@@ -22,7 +22,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_multiple_conflict.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -14,7 +14,7 @@
>>> from zope.site.hooks import setSite
>>> setSite(herd)
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = getUtility(ICatalog)
@@ -22,7 +22,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_name.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_name.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -10,7 +10,7 @@
>>> from zope.site.hooks import setSite
>>> setSite(herd)
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
We have to look up the catalog by name now::
@@ -23,7 +23,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog, name='foo_catalog')
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_nonexistent.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -20,13 +20,13 @@
>>> from zope.site.hooks import setSite
>>> setSite(herd)
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
>>> catalog = getUtility(ICatalog)
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_set.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_set.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_set.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -16,7 +16,7 @@
Let's query the set index::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = getUtility(ICatalog)
>>> def sortedResults(catalog, **kw):
@@ -34,7 +34,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/indexes_site.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/indexes_site.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/indexes_site.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -12,7 +12,7 @@
The catalog is there in the site::
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility, queryUtility
>>> catalog = queryUtility(ICatalog, default=None)
>>> catalog is not None
@@ -22,7 +22,7 @@
other tests::
>>> sm = herd.getSiteManager()
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> sm.unregisterUtility(catalog, provided=ICatalog)
True
>>> from zope.intid.interfaces import IIntIds
Modified: grok/trunk/src/grok/ftests/catalog/setuporder.py
===================================================================
--- grok/trunk/src/grok/ftests/catalog/setuporder.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/catalog/setuporder.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -16,7 +16,7 @@
Then we are able to query the catalog:
- >>> from zope.app.catalog.interfaces import ICatalog
+ >>> from zope.catalog.interfaces import ICatalog
>>> from zope.component import getUtility
>>> catalog = getUtility(ICatalog)
>>> for obj in catalog.searchResults(name=('Ellie', 'Ellie')):
@@ -29,9 +29,9 @@
from zope import schema, interface
from zope.intid import IntIds
from zope.intid.interfaces import IIntIds
-from zope.app.catalog.catalog import Catalog
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.catalog.field import FieldIndex
+from zope.catalog.catalog import Catalog
+from zope.catalog.interfaces import ICatalog
+from zope.catalog.field import FieldIndex
def setup_catalog(catalog):
catalog['name'] = FieldIndex('name', IMammoth)
Modified: grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py
===================================================================
--- grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/ftests/lifecycle/lifecycle_events.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -58,7 +58,7 @@
from zope.interface import Interface
from zope.component import queryUtility
from zope.site.hooks import setSite
-from zope.app.catalog.interfaces import ICatalog
+from zope.catalog.interfaces import ICatalog
class Herd(grok.Container, grok.Application):
Modified: grok/trunk/src/grok/index.py
===================================================================
--- grok/trunk/src/grok/index.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/index.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -18,8 +18,8 @@
from zope.interface import implements
from zope.interface.interfaces import IMethod, IInterface
-from zope.app.catalog.field import FieldIndex
-from zope.app.catalog.text import TextIndex
+from zope.catalog.field import FieldIndex
+from zope.catalog.text import TextIndex
from zc.catalog.catalogindex import SetIndex
from martian.error import GrokError, GrokImportError
Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/src/grok/meta.py 2009-11-28 01:51:45 UTC (rev 106072)
@@ -36,8 +36,8 @@
from zope.intid import IntIds
from zope.intid.interfaces import IIntIds
-from zope.app.catalog.catalog import Catalog
-from zope.app.catalog.interfaces import ICatalog
+from zope.catalog.catalog import Catalog
+from zope.catalog.interfaces import ICatalog
from zope.exceptions.interfaces import DuplicationError
Modified: grok/trunk/versions.cfg
===================================================================
--- grok/trunk/versions.cfg 2009-11-28 01:45:58 UTC (rev 106071)
+++ grok/trunk/versions.cfg 2009-11-28 01:51:45 UTC (rev 106072)
@@ -38,7 +38,7 @@
zope.app.boston = 3.4.0
zope.app.broken = 3.5.0
zope.app.cache = 3.7.0
-zope.app.catalog = 3.8.0
+zope.catalog = 3.8.0
zope.app.component = 3.8.3
zope.app.content = 3.4.0
zope.app.dav = 3.5.1
More information about the checkins
mailing list