[Checkins] SVN: zope.app.catalog/trunk/ Updated zope.app.catalog to depend on the new zope.container rather
Brandon Rhodes
brandon at rhodesmill.org
Thu Jan 29 11:34:57 EST 2009
Log message for revision 95449:
Updated zope.app.catalog to depend on the new zope.container rather
than the larger and heavier zope.app.container.
Changed:
_U zope.app.catalog/trunk/
U zope.app.catalog/trunk/CHANGES.txt
U zope.app.catalog/trunk/buildout.cfg
U zope.app.catalog/trunk/setup.py
U zope.app.catalog/trunk/src/zope/app/catalog/README.txt
U zope.app.catalog/trunk/src/zope/app/catalog/catalog.py
U zope.app.catalog/trunk/src/zope/app/catalog/classes.zcml
U zope.app.catalog/trunk/src/zope/app/catalog/event.txt
U zope.app.catalog/trunk/src/zope/app/catalog/field.py
U zope.app.catalog/trunk/src/zope/app/catalog/interfaces.py
U zope.app.catalog/trunk/src/zope/app/catalog/keyword.py
U zope.app.catalog/trunk/src/zope/app/catalog/subscribers.zcml
U zope.app.catalog/trunk/src/zope/app/catalog/tests.py
U zope.app.catalog/trunk/src/zope/app/catalog/text.py
-=-
Property changes on: zope.app.catalog/trunk
___________________________________________________________________
Added: svn:externals
+ zope.container svn://svn.zope.org/repos/main/zope.container/trunk
zope.app.container svn://svn.zope.org/repos/main/zope.app.container/trunk
Modified: zope.app.catalog/trunk/CHANGES.txt
===================================================================
--- zope.app.catalog/trunk/CHANGES.txt 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/CHANGES.txt 2009-01-29 16:34:56 UTC (rev 95449)
@@ -10,6 +10,9 @@
can't modify with zope.ManageContent permission and it's completely
useless without indexes. So there's no need to show a menu item.
+- Replaced dependency on `zope.app.container` with a lighter-weight
+ dependency upon the newly refactored `zope.container` package.
+
3.6.0 (2009-01-03)
------------------
Modified: zope.app.catalog/trunk/buildout.cfg
===================================================================
--- zope.app.catalog/trunk/buildout.cfg 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/buildout.cfg 2009-01-29 16:34:56 UTC (rev 95449)
@@ -1,5 +1,5 @@
[buildout]
-develop = .
+develop = . zope.container zope.app.container
parts = test
[test]
Modified: zope.app.catalog/trunk/setup.py
===================================================================
--- zope.app.catalog/trunk/setup.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/setup.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -66,9 +66,9 @@
'setuptools',
'ZODB3',
'zope.annotation',
- 'zope.app.container',
'zope.app.intid',
'zope.component',
+ 'zope.container',
'zope.index>=3.5.0',
'zope.interface',
'zope.lifecycleevent',
Modified: zope.app.catalog/trunk/src/zope/app/catalog/README.txt
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/README.txt 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/README.txt 2009-01-29 16:34:56 UTC (rev 95449)
@@ -69,12 +69,12 @@
index:
>>> import zope.app.catalog.attribute
- >>> import zope.app.container.contained
+ >>> import zope.container.contained
>>> import zope.app.catalog.interfaces
>>> class Index(zope.app.catalog.attribute.AttributeIndex,
... BaseIndex,
- ... zope.app.container.contained.Contained,
+ ... zope.container.contained.Contained,
... ):
... zope.interface.implements(zope.app.catalog.interfaces.ICatalogIndex)
@@ -330,7 +330,7 @@
>>> class KeywordIndex(zope.app.catalog.attribute.AttributeIndex,
... BaseKeywordIndex,
- ... zope.app.container.contained.Contained,
+ ... zope.container.contained.Contained,
... ):
... zope.interface.implements(zope.app.catalog.interfaces.ICatalogIndex)
Modified: zope.app.catalog/trunk/src/zope/app/catalog/catalog.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/catalog.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/catalog.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -24,8 +24,8 @@
from zope.interface import implements
from zope.annotation.interfaces import IAttributeAnnotatable
-from zope.app.container.interfaces import IContainer
-from zope.app.container.btree import BTreeContainer
+from zope.container.interfaces import IContainer
+from zope.container.btree import BTreeContainer
from zope.app.catalog.interfaces import ICatalog, INoAutoIndex, INoAutoReindex
from zope.app.intid.interfaces import IIntIds
from zope.traversing.interfaces import IPhysicallyLocatable
Modified: zope.app.catalog/trunk/src/zope/app/catalog/classes.zcml
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/classes.zcml 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/classes.zcml 2009-01-29 16:34:56 UTC (rev 95449)
@@ -20,7 +20,7 @@
permission="zope.ManageServices"
/>
<require
- interface="zope.app.container.interfaces.IContainer"
+ interface="zope.container.interfaces.IContainer"
permission="zope.ManageServices"
/>
</class>
Modified: zope.app.catalog/trunk/src/zope/app/catalog/event.txt
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/event.txt 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/event.txt 2009-01-29 16:34:56 UTC (rev 95449)
@@ -29,7 +29,7 @@
>>> from zope.app.keyreference.testing import SimpleKeyReference
>>> component.provideAdapter(SimpleKeyReference)
- >>> from zope.app.container.contained import Contained
+ >>> from zope.container.contained import Contained
>>> class Dummy(Contained):
... def __init__(self, name):
... self.__name__ = name
Modified: zope.app.catalog/trunk/src/zope/app/catalog/field.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/field.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/field.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -18,7 +18,7 @@
import zope.index.field
import zope.interface
-import zope.app.container.contained
+import zope.container.contained
import zope.app.catalog.attribute
import zope.app.catalog.interfaces
@@ -29,7 +29,7 @@
class FieldIndex(zope.app.catalog.attribute.AttributeIndex,
zope.index.field.FieldIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(IFieldIndex)
Modified: zope.app.catalog/trunk/src/zope/app/catalog/interfaces.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/interfaces.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/interfaces.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -19,8 +19,8 @@
import zope.index.interfaces
import zope.interface
import zope.schema
-import zope.app.container.interfaces
-import zope.app.container.constraints
+import zope.container.interfaces
+import zope.container.constraints
from zope.i18nmessageid import ZopeMessageFactory as _
@@ -64,13 +64,13 @@
class ICatalog(ICatalogQuery, ICatalogEdit,
- zope.app.container.interfaces.IContainer):
+ zope.container.interfaces.IContainer):
"""Marker to describe a catalog in content space."""
- zope.app.container.constraints.contains(ICatalogIndex)
+ zope.container.constraints.contains(ICatalogIndex)
ICatalogIndex['__parent__'].constraint = (
- zope.app.container.constraints.ContainerTypesConstraint(ICatalog))
+ zope.container.constraints.ContainerTypesConstraint(ICatalog))
class IAttributeIndex(zope.interface.Interface):
"""I index objects by first adapting them to an interface, then
Modified: zope.app.catalog/trunk/src/zope/app/catalog/keyword.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/keyword.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/keyword.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -18,7 +18,7 @@
import zope.index.keyword
import zope.interface
-import zope.app.container.contained
+import zope.container.contained
import zope.app.catalog.attribute
import zope.app.catalog.interfaces
@@ -28,12 +28,12 @@
class KeywordIndex(zope.app.catalog.attribute.AttributeIndex,
zope.index.keyword.KeywordIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(IKeywordIndex)
class CaseInsensitiveKeywordIndex(zope.app.catalog.attribute.AttributeIndex,
zope.index.keyword.CaseInsensitiveKeywordIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(IKeywordIndex)
Modified: zope.app.catalog/trunk/src/zope/app/catalog/subscribers.zcml
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/subscribers.zcml 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/subscribers.zcml 2009-01-29 16:34:56 UTC (rev 95449)
@@ -7,7 +7,7 @@
<subscriber
handler=".catalog.indexAdded"
for=".interfaces.ICatalogIndex
- zope.app.container.interfaces.IObjectAddedEvent"
+ zope.container.interfaces.IObjectAddedEvent"
/>
<subscriber
Modified: zope.app.catalog/trunk/src/zope/app/catalog/tests.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/tests.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/tests.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -232,7 +232,7 @@
def test_indexDocSubscriber(self):
from zope.app.catalog.catalog import indexDocSubscriber
- from zope.app.container.contained import ObjectAddedEvent
+ from zope.container.contained import ObjectAddedEvent
from zope.app.intid.interfaces import IntIdAddedEvent
ob = Stub()
@@ -271,7 +271,7 @@
def test_unindexDocSubscriber(self):
from zope.app.catalog.catalog import unindexDocSubscriber
- from zope.app.container.contained import ObjectRemovedEvent
+ from zope.container.contained import ObjectRemovedEvent
from zope.app.intid.interfaces import IntIdRemovedEvent
ob = Stub()
@@ -325,7 +325,7 @@
setup.placefulTearDown()
def iterAll(self, container) :
- from zope.app.container.interfaces import IContainer
+ from zope.container.interfaces import IContainer
for value in container.values() :
yield value
if IContainer.providedBy(value) :
@@ -345,7 +345,6 @@
and call the updateIndexes method. The indexed objects should should
be restricted to the sublocations.
"""
-
self.cat.updateIndexes()
index = self.cat['name']
names = sorted([ob.__name__ for i, ob in index.doc.items()])
@@ -397,7 +396,7 @@
setup.placefulTearDown()
def iterAll(self, container) :
- from zope.app.container.interfaces import IContainer
+ from zope.container.interfaces import IContainer
for value in container.values() :
yield value
if IContainer.providedBy(value) :
@@ -412,7 +411,7 @@
be restricted to the sublocations.
"""
from zope.app.catalog.catalog import indexDocSubscriber
- from zope.app.container.contained import ObjectAddedEvent
+ from zope.container.contained import ObjectAddedEvent
ob = Stub()
self.subfolder['ob'] = ob
@@ -461,9 +460,9 @@
be restricted to the sublocations.
"""
from zope.app.catalog.catalog import indexDocSubscriber
- from zope.app.container.contained import ObjectAddedEvent
+ from zope.container.contained import ObjectAddedEvent
from zope.app.catalog.catalog import unindexDocSubscriber
- from zope.app.container.contained import ObjectRemovedEvent
+ from zope.container.contained import ObjectRemovedEvent
ob = Stub()
self.subfolder['ob'] = ob
Modified: zope.app.catalog/trunk/src/zope/app/catalog/text.py
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/text.py 2009-01-29 16:32:48 UTC (rev 95448)
+++ zope.app.catalog/trunk/src/zope/app/catalog/text.py 2009-01-29 16:34:56 UTC (rev 95449)
@@ -21,7 +21,7 @@
import zope.app.catalog.attribute
import zope.app.catalog.interfaces
-import zope.app.container.contained
+import zope.container.contained
from zope.i18nmessageid import ZopeMessageFactory as _
class ITextIndex(zope.app.catalog.interfaces.IAttributeIndex,
@@ -52,6 +52,6 @@
class TextIndex(zope.app.catalog.attribute.AttributeIndex,
zope.index.text.TextIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(ITextIndex)
More information about the Checkins
mailing list