[Checkins] SVN: zc.catalog/trunk/ Adapt to new lightweight container and catalog-related packages.
Dan Korostelev
nadako at gmail.com
Sun Feb 1 14:36:09 EST 2009
Log message for revision 95941:
Adapt to new lightweight container and catalog-related packages.
Changed:
U zc.catalog/trunk/CHANGES.txt
U zc.catalog/trunk/setup.py
D zc.catalog/trunk/src/zc/catalog/SETUP.cfg
U zc.catalog/trunk/src/zc/catalog/__init__.py
U zc.catalog/trunk/src/zc/catalog/browser/configure.zcml
U zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
U zc.catalog/trunk/src/zc/catalog/browser/tests.py
U zc.catalog/trunk/src/zc/catalog/catalogindex.py
U zc.catalog/trunk/src/zc/catalog/configure.zcml
U zc.catalog/trunk/src/zc/catalog/extentcatalog.py
U zc.catalog/trunk/src/zc/catalog/extentcatalog.txt
U zc.catalog/trunk/src/zc/catalog/interfaces.py
D zc.catalog/trunk/src/zc/catalog/zc.catalog-configure.zcml
D zc.catalog/trunk/zc.catalog-configure.zcml
-=-
Modified: zc.catalog/trunk/CHANGES.txt
===================================================================
--- zc.catalog/trunk/CHANGES.txt 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/CHANGES.txt 2009-02-01 19:36:08 UTC (rev 95941)
@@ -5,10 +5,14 @@
The 1.2 line (and higher) supports Zope 3.4/ZODB 3.8. The 1.1 line supports
Zope 3.3/ZODB 3.7.
-1.3.1 (unreleased)
+1.4.0 (unreleased)
------------------
* Fixed a typo in ValueIndex addform and addMenuItem
+* Use ``zope.container`` instead of ``zope.app.container``.
+* Use ``zope.keyreference`` instead of ``zope.app.keyreference``.
+* Use ``zope.intid`` instead of ``zope.app.intid``.
+* Use ``zope.catalog`` instead of ``zope.app.catalog``.
1.3.0 (2008-09-10)
------------------
Modified: zc.catalog/trunk/setup.py
===================================================================
--- zc.catalog/trunk/setup.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/setup.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -24,7 +24,7 @@
setup(name='zc.catalog',
version = '1.4.0dev',
author='Zope Corporation and Contributors',
- author_email='zope3-dev at zope.org',
+ author_email='zope-dev at zope.org',
description="Extensions to the Zope 3 Catalog",
long_description=(
read('README.txt')
@@ -52,7 +52,7 @@
+ '\n\n' +
read('CHANGES.txt')
),
- keywords = "zope3 i18n date time duration",
+ keywords = "zope3 i18n date time duration catalog index",
classifiers = [
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
@@ -63,35 +63,34 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url='http://cheeseshop.python.org/pypi/zc.catalog',
+ url='http://pypi.python.org/pypi/zc.catalog',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zc'],
extras_require=dict(
test=['zope.app.authentication',
- 'zope.app.intid',
- 'zope.app.keyreference',
+ 'zope.app.catalog',
'zope.app.securitypolicy',
'zope.app.server',
'zope.app.testing',
'zope.app.zcmlfiles',
- 'zope.securitypolicy',
+ 'zope.keyreference',
+ 'zope.intid',
'zope.testbrowser',
'zope.testing',
]),
install_requires=['ZODB3',
'pytz',
'setuptools',
- 'zope.app.catalog',
- 'zope.app.container',
+ 'zope.catalog',
+ 'zope.container',
'zope.component',
'zope.i18nmessageid',
'zope.interface',
'zope.publisher',
'zope.schema',
'zope.security',
- 'zope.testing',
],
include_package_data = True,
zip_safe = False,
Deleted: zc.catalog/trunk/src/zc/catalog/SETUP.cfg
===================================================================
--- zc.catalog/trunk/src/zc/catalog/SETUP.cfg 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/SETUP.cfg 2009-02-01 19:36:08 UTC (rev 95941)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
- zc.catalog-*.zcml
-</data-files>
Modified: zc.catalog/trunk/src/zc/catalog/__init__.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/__init__.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/__init__.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -11,6 +11,4 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""zc.component package
-
-"""
+"""zc.catalog package"""
Modified: zc.catalog/trunk/src/zc/catalog/browser/configure.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/configure.zcml 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/browser/configure.zcml 2009-02-01 19:36:08 UTC (rev 95941)
@@ -9,7 +9,7 @@
<addform
name="AddSetIndex"
label="Add a set index"
- schema="zope.app.catalog.interfaces.IAttributeIndex"
+ schema="zope.catalog.interfaces.IAttributeIndex"
permission="zope.ManageServices"
content_factory="..catalogindex.SetIndex"
arguments="field_name"
@@ -38,7 +38,7 @@
<addform
name="AddValueIndex"
label="Add a value index"
- schema="zope.app.catalog.interfaces.IAttributeIndex"
+ schema="zope.catalog.interfaces.IAttributeIndex"
permission="zope.ManageServices"
content_factory="..catalogindex.ValueIndex"
arguments="field_name"
Modified: zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml 2009-02-01 19:36:08 UTC (rev 95941)
@@ -16,8 +16,8 @@
<include package="zope.app.authentication" />
<include package="zope.app.server" />
- <include package="zope.app.keyreference" />
- <include package="zope.app.intid" />
+ <include package="zope.keyreference" />
+ <include package="zope.intid" />
<include package="zope.app.catalog" />
<include package="zc.catalog" />
Modified: zc.catalog/trunk/src/zc/catalog/browser/tests.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/tests.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/browser/tests.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -23,9 +23,9 @@
import zope.app.appsetup.bootstrap
import zope.app.appsetup.interfaces
-import zope.app.intid
-import zope.app.intid.interfaces
import zope.app.testing.functional
+import zope.intid
+import zope.intid.interfaces
here = os.path.dirname(os.path.realpath(__file__))
@@ -41,11 +41,11 @@
db, connection, root, root_folder = (
zope.app.appsetup.bootstrap.getInformationFromEvent(event))
sm = root_folder.getSiteManager()
- intids = zope.app.intid.IntIds()
+ intids = zope.intid.IntIds()
sm["default"]["test-int-ids"] = intids
sm.registerUtility(
intids,
- zope.app.intid.interfaces.IIntIds)
+ zope.intid.interfaces.IIntIds)
transaction.commit()
connection.close()
Modified: zc.catalog/trunk/src/zc/catalog/catalogindex.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/catalogindex.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/catalogindex.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -11,40 +11,40 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Indexes appropriate for zope.app.catalog
+"""Indexes appropriate for zope.catalog
$Id: catalogindex.py 2918 2005-07-19 22:12:38Z jim $
"""
import zope.interface
-import zope.app.container.contained
-import zope.app.catalog.attribute
+import zope.catalog.attribute
+import zope.container.contained
import zc.catalog.index
import zc.catalog.interfaces
-class ValueIndex(zope.app.catalog.attribute.AttributeIndex,
+class ValueIndex(zope.catalog.attribute.AttributeIndex,
zc.catalog.index.ValueIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(zc.catalog.interfaces.ICatalogValueIndex)
-class SetIndex(zope.app.catalog.attribute.AttributeIndex,
+class SetIndex(zope.catalog.attribute.AttributeIndex,
zc.catalog.index.SetIndex,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(zc.catalog.interfaces.ICatalogSetIndex)
class NormalizationWrapper(
- zope.app.catalog.attribute.AttributeIndex,
+ zope.catalog.attribute.AttributeIndex,
zc.catalog.index.NormalizationWrapper,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
pass
class CallableWrapper(zc.catalog.index.CallableWrapper,
- zope.app.container.contained.Contained):
+ zope.container.contained.Contained):
zope.interface.implements(zc.catalog.interfaces.ICallableWrapper)
Modified: zc.catalog/trunk/src/zc/catalog/configure.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/configure.zcml 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/configure.zcml 2009-02-01 19:36:08 UTC (rev 95941)
@@ -9,15 +9,15 @@
id="zc.catalog.extentcatalog"
/>
<require
- interface="zope.app.catalog.interfaces.ICatalogQuery"
+ interface="zope.catalog.interfaces.ICatalogQuery"
permission="zope.Public"
/>
<require
- interface="zope.app.catalog.interfaces.ICatalogEdit"
+ interface="zope.catalog.interfaces.ICatalogEdit"
permission="zope.ManageServices"
/>
<require
- interface="zope.app.container.interfaces.IContainer"
+ interface="zope.container.interfaces.IContainer"
permission="zope.ManageServices"
/>
</class>
@@ -37,27 +37,27 @@
<class class=".catalogindex.ValueIndex">
<require
permission="zope.ManageServices"
- interface="zope.app.catalog.interfaces.IAttributeIndex
+ interface="zope.catalog.interfaces.IAttributeIndex
zope.index.interfaces.IStatistics"
- set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+ set_schema="zope.catalog.interfaces.IAttributeIndex"
/>
</class>
<class class=".catalogindex.SetIndex">
<require
permission="zope.ManageServices"
- interface="zope.app.catalog.interfaces.IAttributeIndex
+ interface="zope.catalog.interfaces.IAttributeIndex
zope.index.interfaces.IStatistics"
- set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+ set_schema="zope.catalog.interfaces.IAttributeIndex"
/>
</class>
<class class=".catalogindex.NormalizationWrapper">
<require
permission="zope.ManageServices"
- interface="zope.app.catalog.interfaces.IAttributeIndex
+ interface="zope.catalog.interfaces.IAttributeIndex
zope.index.interfaces.IStatistics"
- set_schema="zope.app.catalog.interfaces.IAttributeIndex"
+ set_schema="zope.catalog.interfaces.IAttributeIndex"
/>
</class>
Modified: zc.catalog/trunk/src/zc/catalog/extentcatalog.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/extentcatalog.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/extentcatalog.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -20,8 +20,8 @@
import BTrees
import persistent
from zope import interface, component
-from zope.app.catalog import catalog
-from zope.app.intid.interfaces import IIntIds
+from zope.catalog import catalog
+from zope.intid.interfaces import IIntIds
import zope.component
from zope.component.interfaces import IFactory
Modified: zc.catalog/trunk/src/zc/catalog/extentcatalog.txt
===================================================================
--- zc.catalog/trunk/src/zc/catalog/extentcatalog.txt 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/extentcatalog.txt 2009-02-01 19:36:08 UTC (rev 95941)
@@ -22,10 +22,10 @@
>>> root = makeRoot()
>>> intid = zope.component.getUtility(
- ... zope.app.intid.interfaces.IIntIds, context=root)
+ ... zope.intid.interfaces.IIntIds, context=root)
>>> TreeSet = btrees_family.IF.TreeSet
- >>> from zope.app.container.interfaces import IContained
+ >>> from zope.container.interfaces import IContained
>>> class DummyIndex(persistent.Persistent):
... interface.implements(IContained)
... __parent__ = __name__ = None
@@ -171,7 +171,7 @@
We can pass our own instantiated UID utility to extentcatalog.Catalog.
>>> ext = extentcatalog.Extent(family=btrees_family)
- >>> UIDSource = zope.app.intid.IntIds()
+ >>> UIDSource = zope.intid.IntIds()
>>> cat = extentcatalog.Catalog(ext, UIDSource=UIDSource)
>>> cat.UIDSource is UIDSource
True
@@ -420,9 +420,9 @@
.. [#setup] We create the state that the text needs here.
- >>> import zope.app.keyreference.persistent
+ >>> import zope.keyreference.persistent
>>> import zope.component
- >>> import zope.app.intid
+ >>> import zope.intid
>>> import zope.component
>>> import zope.component.interfaces
>>> import zope.component.persistentregistry
@@ -430,10 +430,10 @@
>>> import transaction
>>> zope.component.provideAdapter(
- ... zope.app.keyreference.persistent.KeyReferenceToPersistent,
+ ... zope.keyreference.persistent.KeyReferenceToPersistent,
... adapts=(zope.interface.Interface,))
>>> zope.component.provideAdapter(
- ... zope.app.keyreference.persistent.connectionOfPersistent,
+ ... zope.keyreference.persistent.connectionOfPersistent,
... adapts=(zope.interface.Interface,))
>>> site_manager = None
@@ -465,8 +465,8 @@
... zope.component.persistentregistry.PersistentComponents())
... site_manager.__bases__ = (zope.component.getGlobalSiteManager(),)
... site_manager.registerUtility(
- ... zope.app.intid.IntIds(family=btrees_family),
- ... provided=zope.app.intid.interfaces.IIntIds)
+ ... zope.intid.IntIds(family=btrees_family),
+ ... provided=zope.intid.interfaces.IIntIds)
... setSiteManager(site_manager)
... transaction.commit()
... return root
@@ -483,6 +483,6 @@
.. [#cleanup] Unregister the objects of the previous tests from intid utility:
>>> intid = zope.component.getUtility(
- ... zope.app.intid.interfaces.IIntIds, context=root)
+ ... zope.intid.interfaces.IIntIds, context=root)
>>> for doc_id in matches:
... intid.unregister(intid.queryObject(doc_id))
Modified: zc.catalog/trunk/src/zc/catalog/interfaces.py
===================================================================
--- zc.catalog/trunk/src/zc/catalog/interfaces.py 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/interfaces.py 2009-02-01 19:36:08 UTC (rev 95941)
@@ -19,7 +19,7 @@
from zope import interface, schema
from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
import zope.index.interfaces
-import zope.app.catalog.interfaces
+import zope.catalog.interfaces
from zc.catalog.i18n import _
import BTrees.Interfaces
@@ -129,7 +129,7 @@
class IExtentCatalog(interface.Interface):
"""A catalog of only items within an extent.
- Interface intended to be used with zope.app.catalog.interfaces.ICatalog"""
+ Interface intended to be used with zope.catalog.interfaces.ICatalog"""
extent = interface.Attribute(
"""An IExtent of the objects cataloged""")
@@ -246,14 +246,14 @@
"""
-class ICatalogValueIndex(zope.app.catalog.interfaces.IAttributeIndex,
- zope.app.catalog.interfaces.ICatalogIndex):
+class ICatalogValueIndex(zope.catalog.interfaces.IAttributeIndex,
+ zope.catalog.interfaces.ICatalogIndex):
"""Interface-based catalog value index
"""
-class ICatalogSetIndex(zope.app.catalog.interfaces.IAttributeIndex,
- zope.app.catalog.interfaces.ICatalogIndex):
+class ICatalogSetIndex(zope.catalog.interfaces.IAttributeIndex,
+ zope.catalog.interfaces.ICatalogIndex):
"""Interface-based catalog set index
"""
Deleted: zc.catalog/trunk/src/zc/catalog/zc.catalog-configure.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/zc.catalog-configure.zcml 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/src/zc/catalog/zc.catalog-configure.zcml 2009-02-01 19:36:08 UTC (rev 95941)
@@ -1 +0,0 @@
-<include package="zc.catalog"/>
\ No newline at end of file
Deleted: zc.catalog/trunk/zc.catalog-configure.zcml
===================================================================
--- zc.catalog/trunk/zc.catalog-configure.zcml 2009-02-01 19:35:30 UTC (rev 95940)
+++ zc.catalog/trunk/zc.catalog-configure.zcml 2009-02-01 19:36:08 UTC (rev 95941)
@@ -1,3 +0,0 @@
-<!-- install this into your Zope 3 instance's etc/package-includes
- directory -->
-<include package="zc.catalog"/>
\ No newline at end of file
More information about the Checkins
mailing list