[Checkins] SVN: grok/trunk/ migrate from zope.app.container to zope.container
Kevin Teague
kevin at bud.ca
Fri Nov 27 21:21:32 EST 2009
Log message for revision 106073:
migrate from zope.app.container to zope.container
Changed:
U grok/trunk/doc/developing_grok.rst
U grok/trunk/doc/grok_overview.rst
U grok/trunk/doc/reference/components.rst
U grok/trunk/setup.py
U grok/trunk/src/grok/__init__.py
U grok/trunk/src/grok/components.py
U grok/trunk/src/grok/configure.zcml
U grok/trunk/src/grok/interfaces.py
U grok/trunk/src/grok/tests/container/container.py
U grok/trunk/src/grok/tests/container/orderedcontainer.py
U grok/trunk/src/grok/tests/container/orderedcontainerfiresevent.py
U grok/trunk/versions.cfg
-=-
Modified: grok/trunk/doc/developing_grok.rst
===================================================================
--- grok/trunk/doc/developing_grok.rst 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/doc/developing_grok.rst 2009-11-28 02:21:32 UTC (rev 106073)
@@ -139,7 +139,7 @@
zope.i18nmessageid
zope.interface
zope.security
- zope.app.container
+ zope.container
ZODB3
zope.hookable
zope.proxy
Modified: grok/trunk/doc/grok_overview.rst
===================================================================
--- grok/trunk/doc/grok_overview.rst 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/doc/grok_overview.rst 2009-11-28 02:21:32 UTC (rev 106073)
@@ -1119,13 +1119,13 @@
event handler registration, but the principle also works for the first
argument. For example, to handle ``IObjectModifiedEvent`` events for
all kinds of containers, you can subscribe to
-``zope.app.container.interfaces.IContainer`` objects::
+``zope.container.interfaces.IContainer`` objects::
@grok.subscribe(IContainer, IObjectModifiedEvent):
def handle_event(obj, event):
"Called whenever any container is modified"
-``zope.app.container.interfaces.IContainer`` defines the abstract
+``zope.container.interfaces.IContainer`` defines the abstract
container API that all containers must provide, no matter how they are
implemented internally.
@@ -1137,7 +1137,7 @@
classes. To write an adapter that works for any kind of container, you
can write::
- from zope.app.container.interfaces import IContainer
+ from zope.container.interfaces import IContainer
class SortedKeysAdapter(grok.Adapter):
grok.context(IContainer)
@@ -1152,7 +1152,7 @@
The same principle can also be used with ``grok.context`` in other
places, such as in views. This view is registered for all containers::
- from zope.app.container.interfaces import IContainer
+ from zope.container.interfaces import IContainer
class Keys(grok.View):
grok.context(IContainer)
Modified: grok/trunk/doc/reference/components.rst
===================================================================
--- grok/trunk/doc/reference/components.rst 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/doc/reference/components.rst 2009-11-28 02:21:32 UTC (rev 106073)
@@ -73,7 +73,7 @@
Objects in a container are manipulated using the same syntax as you would
with a standard Python Dictionary object. The container implements the
-zope.app.container.interfaces.IContainer interface using a BTree, providing
+zope.container.interfaces.IContainer interface using a BTree, providing
reasonable performance for large collections of objects.
.. class:: grok.Container
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/setup.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -49,7 +49,6 @@
'zope.annotation',
'zope.app.appsetup',
'zope.app.authentication',
- 'zope.app.container',
'zope.app.folder',
'zope.app.pagetemplate',
'zope.app.publication',
@@ -60,6 +59,7 @@
'zope.app.twisted',
'zope.app.zcmlfiles',
'zope.catalog',
+ 'zope.container',
'zope.component',
'zope.configuration',
'zope.dottedname',
Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/__init__.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -66,12 +66,12 @@
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from zope.app.container.interfaces import (
+from zope.container.interfaces import (
IObjectAddedEvent,
IObjectMovedEvent,
IObjectRemovedEvent,
IContainerModifiedEvent)
-from zope.app.container.contained import (
+from zope.container.contained import (
ObjectAddedEvent,
ObjectMovedEvent,
ObjectRemovedEvent,
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/components.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -33,11 +33,11 @@
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.app.publisher.browser import getDefaultViewName
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.contained import Contained
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.interfaces import IOrderedContainer
-from zope.app.container.contained import notifyContainerModified
+from zope.container.btree import BTreeContainer
+from zope.container.contained import Contained
+from zope.container.interfaces import IReadContainer
+from zope.container.interfaces import IOrderedContainer
+from zope.container.contained import notifyContainerModified
from persistent.list import PersistentList
import grok
Modified: grok/trunk/src/grok/configure.zcml
===================================================================
--- grok/trunk/src/grok/configure.zcml 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/configure.zcml 2009-11-28 02:21:32 UTC (rev 106073)
@@ -9,10 +9,13 @@
<include package="zope.app.zcmlfiles" file="meta.zcml" />
<include package="grok" file="meta.zcml" />
+ <include package="zope.catalog" />
<include package="zope.copypastemove" />
<include package="zope.contentprovider" />
<include package="zope.formlib" />
+ <include package="zope.intid" />
<include package="zope.i18n.locales" />
+ <include package="zope.keyreference" />
<include package="zope.publisher" />
<include package="zope.securitypolicy" />
<include package="zope.size" />
@@ -20,9 +23,6 @@
<include package="zope.traversing.browser" />
<include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
- <include package="zope.intid" />
- <include package="zope.keyreference" />
- <include package="zope.catalog" />
<include package="zope.app.renderer" />
<include package="zope.app.session" />
Modified: grok/trunk/src/grok/interfaces.py
===================================================================
--- grok/trunk/src/grok/interfaces.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/interfaces.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -17,7 +17,7 @@
from zope.interface.interfaces import IInterface
from zope.component.interfaces import IObjectEvent
from zope.publisher.interfaces.http import IHTTPRequest
-from zope.app.container.interfaces import IContainer as IContainerBase
+from zope.container.interfaces import IContainer as IContainerBase
# Expose interfaces from grokcore.* packages as well:
import grokcore.annotation.interfaces
Modified: grok/trunk/src/grok/tests/container/container.py
===================================================================
--- grok/trunk/src/grok/tests/container/container.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/tests/container/container.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -6,12 +6,12 @@
>>> grok.testing.grok(__name__)
- >>> from zope.app.container.interfaces import IContainer
+ >>> from zope.container.interfaces import IContainer
>>> bag = BoneBag()
>>> IContainer.providedBy(bag)
True
- >>> from zope.app.container.btree import BTreeContainer
+ >>> from zope.container.btree import BTreeContainer
>>> isinstance(bag, BTreeContainer)
True
Modified: grok/trunk/src/grok/tests/container/orderedcontainer.py
===================================================================
--- grok/trunk/src/grok/tests/container/orderedcontainer.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/tests/container/orderedcontainer.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -7,14 +7,14 @@
>>> grok.testing.grok(__name__)
- >>> from zope.app.container.interfaces import IContainer
+ >>> from zope.container.interfaces import IContainer
>>> bones = OrderedBones()
>>> IContainer.providedBy(bones)
True
- >>> from zope.app.container.interfaces import IOrderedContainer
+ >>> from zope.container.interfaces import IOrderedContainer
>>> IOrderedContainer.providedBy(bones)
True
- >>> from zope.app.container.btree import BTreeContainer
+ >>> from zope.container.btree import BTreeContainer
>>> isinstance(bones, BTreeContainer)
True
Modified: grok/trunk/src/grok/tests/container/orderedcontainerfiresevent.py
===================================================================
--- grok/trunk/src/grok/tests/container/orderedcontainerfiresevent.py 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/src/grok/tests/container/orderedcontainerfiresevent.py 2009-11-28 02:21:32 UTC (rev 106073)
@@ -33,7 +33,7 @@
def __init__(self, name):
self.name = name
-from zope.app.container.interfaces import IContainerModifiedEvent
+from zope.container.interfaces import IContainerModifiedEvent
@grok.subscribe(OrderedBones, IContainerModifiedEvent)
def container_changed(object, event):
print 'Container has changed!'
Modified: grok/trunk/versions.cfg
===================================================================
--- grok/trunk/versions.cfg 2009-11-28 01:51:45 UTC (rev 106072)
+++ grok/trunk/versions.cfg 2009-11-28 02:21:32 UTC (rev 106073)
@@ -174,7 +174,6 @@
zdaemon = 2.0.4
ZODB3 = 3.9.3
zodbcode = 3.4.0
-zope.app.container = 3.8.0
zope.app.folder = 3.5.1
zope.app.interface = 3.5.0
zope.app.localpermission = 3.7.0
More information about the checkins
mailing list