[Checkins] SVN: z3c.indexer/trunk/ Use new lightweight packages for container/site/intid etc.
Dan Korostelev
nadako at gmail.com
Sun Feb 1 13:41:48 EST 2009
Log message for revision 95906:
Use new lightweight packages for container/site/intid etc.
Changed:
U z3c.indexer/trunk/CHANGES.txt
U z3c.indexer/trunk/README.txt
U z3c.indexer/trunk/setup.py
U z3c.indexer/trunk/src/z3c/indexer/README.txt
U z3c.indexer/trunk/src/z3c/indexer/_bbb.py
U z3c.indexer/trunk/src/z3c/indexer/index.py
U z3c.indexer/trunk/src/z3c/indexer/indexer.py
U z3c.indexer/trunk/src/z3c/indexer/interfaces.py
U z3c.indexer/trunk/src/z3c/indexer/performance.py
U z3c.indexer/trunk/src/z3c/indexer/search.py
U z3c.indexer/trunk/src/z3c/indexer/subscriber.py
U z3c.indexer/trunk/src/z3c/indexer/testing.py
U z3c.indexer/trunk/src/z3c/indexer/tests.py
-=-
Modified: z3c.indexer/trunk/CHANGES.txt
===================================================================
--- z3c.indexer/trunk/CHANGES.txt 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/CHANGES.txt 2009-02-01 18:41:48 UTC (rev 95906)
@@ -25,6 +25,9 @@
- Reworded package description to make it nicer. Fix little docstring typos.
+- Use new lightweight and ZMI-less versions of packages: zope.keyreference,
+ zope.intid, zope.site, zope.container and zope.catalog (for tests).
+
0.5.1 (2008-12-11)
------------------
Modified: z3c.indexer/trunk/README.txt
===================================================================
--- z3c.indexer/trunk/README.txt 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/README.txt 2009-02-01 18:41:48 UTC (rev 95906)
@@ -1,2 +1,2 @@
This package provides a way to index objects and query indexes for Zope3. This
-implementation is different from zope.app.catalog and is an alternative to it.
+implementation is different from zope.catalog and is an alternative to it.
Modified: z3c.indexer/trunk/setup.py
===================================================================
--- z3c.indexer/trunk/setup.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/setup.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -54,16 +54,16 @@
'z3c.coverage',
'z3c.testing',
'zope.testing',
- 'zope.app.keyreference',
- 'zope.app.component',
+ 'zope.keyreference',
+ 'zope.site',
],
performance = [
'zc.catalog',
- 'zope.app.catalog',
- 'zope.app.component',
- 'zope.app.container',
- 'zope.app.intid',
- 'zope.app.keyreference',
+ 'zope.catalog',
+ 'zope.site',
+ 'zope.container',
+ 'zope.intid',
+ 'zope.keyreference',
'zope.app.testing',
'zope.cachedescriptors',
'zope.component',
@@ -79,9 +79,9 @@
install_requires = [
'setuptools',
'zc.catalog',
- 'zope.app.container',
- 'zope.app.intid',
- 'zope.app.keyreference',
+ 'zope.container',
+ 'zope.intid',
+ 'zope.keyreference',
'zope.cachedescriptors',
'zope.component',
'zope.deferredimport',
Modified: z3c.indexer/trunk/src/z3c/indexer/README.txt
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/README.txt 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/README.txt 2009-02-01 18:41:48 UTC (rev 95906)
@@ -79,7 +79,7 @@
indexer parent moved time: 15.00 s
indexer object remove time: 2.08 s
-zope.app.catalog
+zope.catalog
catalog based indexing time: 14.41 s
catalog based query time: 0.97 s
catalog based not query time: 3.63 s
@@ -123,7 +123,7 @@
indexer parent moved time: 15.09 s
indexer object remove time: 2.09 s
-zope.app.catalog
+zope.catalog
catalog based indexing time: 36.92 s
catalog based query time: 0.75 s
catalog based not query time: 2.66 s
@@ -158,7 +158,7 @@
- Allow to explicitly define of what, where and when get indexed.
- - Reduce index calls. The existing zope.app.catalog implementation forces to
+ - Reduce index calls. The existing zope.catalog implementation forces to
index every object which raises a ObjectAddedEvent. This ends in trying to
index each object on every existing index contained in a catalog.
@@ -218,8 +218,8 @@
Setup some helpers:
>>> import zope.component
- >>> from zope.app import folder
- >>> from zope.app.component.site import LocalSiteManager
+ >>> from zope.site import folder
+ >>> from zope.site import LocalSiteManager
>>> from z3c.indexer import interfaces
>>> from z3c.indexer import testing
@@ -236,13 +236,13 @@
And set the site as the current site. This is normaly done by traversing to a
site:
- >>> from zope.app.component import hooks
+ >>> from zope.site import hooks
>>> hooks.setSite(site)
Setup a IIntIds utility:
- >>> from zope.app.intid import IntIds
- >>> from zope.app.intid.interfaces import IIntIds
+ >>> from zope.intid import IntIds
+ >>> from zope.intid.interfaces import IIntIds
>>> intids = IntIds()
>>> sm['default']['intids'] = intids
>>> sm.registerUtility(intids, IIntIds)
@@ -299,7 +299,7 @@
>>> import persistent
>>> import zope.interface
- >>> from zope.app.container import contained
+ >>> from zope.container import contained
>>> from zope.schema.fieldproperty import FieldProperty
>>> class IDemoContent(zope.interface.Interface):
@@ -1132,8 +1132,8 @@
which removes such duplications. Since this is the first test which uses
IIntId subscribers let' register them:
- >>> from zope.app.intid import addIntIdSubscriber
- >>> from zope.app.intid import removeIntIdSubscriber
+ >>> from zope.intid import addIntIdSubscriber
+ >>> from zope.intid import removeIntIdSubscriber
>>> zope.component.provideHandler(addIntIdSubscriber)
>>> zope.component.provideHandler(removeIntIdSubscriber)
Modified: z3c.indexer/trunk/src/z3c/indexer/_bbb.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/_bbb.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/_bbb.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -18,8 +18,8 @@
import zope.interface
import zope.component
-from zope.app.intid.interfaces import IIntIdAddedEvent
-from zope.app.intid.interfaces import IIntIdRemovedEvent
+from zope.intid.interfaces import IIntIdAddedEvent
+from zope.intid.interfaces import IIntIdRemovedEvent
from z3c.indexer import interfaces
from z3c.indexer import indexer
Modified: z3c.indexer/trunk/src/z3c/indexer/index.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/index.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/index.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -23,7 +23,7 @@
import zope.interface
from zope.index.field import index as fieldindex
from zope.index.text import textindex
-from zope.app.container import contained
+from zope.container import contained
from zc.catalog import index as zcindex
from z3c.indexer import interfaces
Modified: z3c.indexer/trunk/src/z3c/indexer/indexer.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/indexer.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/indexer.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -20,7 +20,7 @@
import zope.component
import zope.deferredimport
from zope.cachedescriptors.property import Lazy
-from zope.app.intid.interfaces import IIntIds
+from zope.intid.interfaces import IIntIds
from z3c.indexer import interfaces
Modified: z3c.indexer/trunk/src/z3c/indexer/interfaces.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/interfaces.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/interfaces.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -24,7 +24,7 @@
from zope.index.interfaces import IInjection
from zope.index.interfaces import IIndexSearch
from zope.index.interfaces import IStatistics
-from zope.app.container.interfaces import IContained
+from zope.container.interfaces import IContained
NOVALUE = object()
Modified: z3c.indexer/trunk/src/z3c/indexer/performance.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/performance.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/performance.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -28,29 +28,29 @@
from BTrees.IFBTree import difference, IFBTree
from zope.index.text.textindex import TextIndex as ZTextIndex
-from zope.app.keyreference.interfaces import IKeyReference
-from zope.app.keyreference.testing import SimpleKeyReference
+from zope.keyreference.interfaces import IKeyReference
+from zope.keyreference.testing import SimpleKeyReference
-from zope.app.component import hooks
-from zope.app.catalog.interfaces import ICatalog
-from zope.app.catalog.field import FieldIndex as ZFieldIndex
-from zope.app.catalog.interfaces import ICatalogIndex
-from zope.app.catalog.catalog import Catalog
-from zope.app.catalog.catalog import indexAdded
-from zope.app.catalog.catalog import indexDocSubscriber
-from zope.app.catalog.catalog import reindexDocSubscriber
-from zope.app.catalog.catalog import unindexDocSubscriber
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.interfaces import IObjectModifiedEvent
-from zope.app.container.interfaces import IObjectMovedEvent
-from zope.app.container import contained
-from zope.app.intid import IntIds
-from zope.app.intid import addIntIdSubscriber
-from zope.app.intid import removeIntIdSubscriber
-from zope.app.intid.interfaces import IIntIds
-from zope.app.intid.interfaces import IIntIdAddedEvent
-from zope.app.intid.interfaces import IIntIdRemovedEvent
+from zope.site import hooks
+from zope.catalog.interfaces import ICatalog
+from zope.catalog.field import FieldIndex as ZFieldIndex
+from zope.catalog.interfaces import ICatalogIndex
+from zope.catalog.catalog import Catalog
+from zope.catalog.catalog import indexAdded
+from zope.catalog.catalog import indexDocSubscriber
+from zope.catalog.catalog import reindexDocSubscriber
+from zope.catalog.catalog import unindexDocSubscriber
+from zope.container.interfaces import IReadContainer
+from zope.container.interfaces import IObjectAddedEvent
+from zope.container.interfaces import IObjectModifiedEvent
+from zope.container.interfaces import IObjectMovedEvent
+from zope.container import contained
+from zope.intid import IntIds
+from zope.intid import addIntIdSubscriber
+from zope.intid import removeIntIdSubscriber
+from zope.intid.interfaces import IIntIds
+from zope.intid.interfaces import IIntIdAddedEvent
+from zope.intid.interfaces import IIntIdRemovedEvent
from zope.app.testing import setup
from zc.catalog import index as zcindex
@@ -393,7 +393,7 @@
#
# performance test
#
-# This performance test will show that the default zope.app.catalog based
+# This performance test will show that the default zope.catalog based
# indexing pattern is very bad on a large set of indexes. Because the default
# catalog pattern tries to index every object in every index.
#
@@ -478,8 +478,8 @@
print ""
- print "zope.app.catalog"
- # setup zope.app.catalog based performance test
+ print "zope.catalog"
+ # setup zope.catalog based performance test
catalogSite = setUpCatalog(amountOfIndexes)
# time catalog indexing
Modified: z3c.indexer/trunk/src/z3c/indexer/search.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/search.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/search.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -18,7 +18,7 @@
import zope.interface
import zope.component
-from zope.app.intid.interfaces import IIntIds
+from zope.intid.interfaces import IIntIds
from zope.index.interfaces import IIndexSort
from zc.catalog.index import FamilyProperty
Modified: z3c.indexer/trunk/src/z3c/indexer/subscriber.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/subscriber.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/subscriber.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -24,8 +24,8 @@
import zope.deferredimport
import zope.lifecycleevent.interfaces
-import zope.app.intid.interfaces
-from zope.app.intid.interfaces import IIntIds
+import zope.intid.interfaces
+from zope.intid.interfaces import IIntIds
from z3c.indexer import interfaces
from z3c.indexer import collector
@@ -69,7 +69,7 @@
#
###############################################################################
# object added
- at zope.component.adapter(zope.app.intid.interfaces.IIntIdAddedEvent)
+ at zope.component.adapter(zope.intid.interfaces.IIntIdAddedEvent)
def intIdAddedEventDispatcher(event):
"""Event subscriber to dispatch IntIdAddedEvent to IIndexer adapters.
@@ -102,7 +102,7 @@
# object removed
- at zope.component.adapter(zope.app.intid.interfaces.IIntIdRemovedEvent)
+ at zope.component.adapter(zope.intid.interfaces.IIntIdRemovedEvent)
def intIdRemovedEventDispatcher(event):
"""Event subscriber to dispatch IIntIdRemovedEvent to interested adapters.
Modified: z3c.indexer/trunk/src/z3c/indexer/testing.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/testing.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/testing.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -17,8 +17,8 @@
__docformat__ = "reStructuredText"
import zope.component
-from zope.app import folder
-from zope.app.keyreference.testing import SimpleKeyReference
+from zope.site import folder
+from zope.keyreference.testing import SimpleKeyReference
from zope.app.testing import setup
Modified: z3c.indexer/trunk/src/z3c/indexer/tests.py
===================================================================
--- z3c.indexer/trunk/src/z3c/indexer/tests.py 2009-02-01 18:24:52 UTC (rev 95905)
+++ z3c.indexer/trunk/src/z3c/indexer/tests.py 2009-02-01 18:41:48 UTC (rev 95906)
@@ -19,9 +19,9 @@
import unittest
import zope.component
from zope.testing import doctest
-from zope.app.intid import IntIds
-from zope.app.intid.interfaces import IIntIds
-from zope.app.keyreference.interfaces import IKeyReference
+from zope.intid import IntIds
+from zope.intid.interfaces import IIntIds
+from zope.keyreference.interfaces import IKeyReference
import z3c.testing
from z3c.indexer import interfaces
More information about the Checkins
mailing list