[Checkins] SVN: zope.app.workflow/trunk/ use zope.container instead of zope.app.container
Wolfgang Schnerring
wosc at wosc.de
Thu Jan 29 12:55:54 EST 2009
Log message for revision 95456:
use zope.container instead of zope.app.container
Changed:
U zope.app.workflow/trunk/CHANGES.txt
U zope.app.workflow/trunk/setup.py
U zope.app.workflow/trunk/src/zope/app/workflow/configure.zcml
U zope.app.workflow/trunk/src/zope/app/workflow/definition.py
U zope.app.workflow/trunk/src/zope/app/workflow/instance.py
U zope.app.workflow/trunk/src/zope/app/workflow/interfaces/__init__.py
U zope.app.workflow/trunk/src/zope/app/workflow/interfaces/wfmc.py
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/configure.zcml
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/configure.zcml
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/contentworkflow.py
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/instance.py
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_instance.py
-=-
Modified: zope.app.workflow/trunk/CHANGES.txt
===================================================================
--- zope.app.workflow/trunk/CHANGES.txt 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/CHANGES.txt 2009-01-29 17:55:54 UTC (rev 95456)
@@ -5,7 +5,7 @@
3.5 (unreleased)
----------------
-- ...
+- Use zope.container instead of zope.app.container.
3.4.2 (2009-01-27)
------------------
Modified: zope.app.workflow/trunk/setup.py
===================================================================
--- zope.app.workflow/trunk/setup.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/setup.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -54,6 +54,7 @@
install_requires = ['setuptools',
'ZODB3',
'zope.component',
+ 'zope.container',
'zope.interface',
'zope.lifecycleevent',
'zope.app.container',
Modified: zope.app.workflow/trunk/src/zope/app/workflow/configure.zcml
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/configure.zcml 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/configure.zcml 2009-01-29 17:55:54 UTC (rev 95456)
@@ -65,11 +65,11 @@
/>
<require
permission="zope.View"
- interface="zope.app.container.interfaces.IReadContainer"
+ interface="zope.container.interfaces.IReadContainer"
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
- interface="zope.app.container.interfaces.IWriteContainer"
+ interface="zope.container.interfaces.IWriteContainer"
/>
</class>
Modified: zope.app.workflow/trunk/src/zope/app/workflow/definition.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/definition.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/definition.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -23,7 +23,7 @@
from zope.schema.interfaces import IVocabularyTokenized
from zope.schema.interfaces import ITokenizedTerm, IVocabularyFactory
-from zope.app.container.contained import Contained, setitem, uncontained
+from zope.container.contained import Contained, setitem, uncontained
from zope.app.workflow.interfaces import IProcessDefinitionElementContainer
from zope.app.workflow.interfaces import IProcessDefinition
Modified: zope.app.workflow/trunk/src/zope/app/workflow/instance.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/instance.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/instance.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -23,8 +23,8 @@
from zope.annotation.interfaces import IAnnotatable, IAnnotations
from zope.interface import implements
-from zope.app.container.interfaces import IContained
-from zope.app.container.contained import Contained, setitem, uncontained
+from zope.container.interfaces import IContained
+from zope.container.contained import Contained, setitem, uncontained
from zope.app.workflow.interfaces import IProcessInstance, IProcessDefinition
from zope.app.workflow.interfaces import IProcessInstanceContainer
Modified: zope.app.workflow/trunk/src/zope/app/workflow/interfaces/__init__.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/interfaces/__init__.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/interfaces/__init__.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -17,7 +17,7 @@
"""
from zope.interface import Interface, Attribute
from zope.i18nmessageid import ZopeMessageFactory as _
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
class IWorkflowEvent(Interface):
Modified: zope.app.workflow/trunk/src/zope/app/workflow/interfaces/wfmc.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/interfaces/wfmc.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/interfaces/wfmc.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -21,7 +21,7 @@
from zope.app.workflow.interfaces import IProcessDefinition
from zope.app.workflow.interfaces import IProcessInstance
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
# TODO:
# - Specify all attributes as schema fields where possible
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/configure.zcml
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/configure.zcml 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/configure.zcml 2009-01-29 17:55:54 UTC (rev 95456)
@@ -148,7 +148,7 @@
<page
- for="zope.app.container.interfaces.IContainer"
+ for="zope.container.interfaces.IContainer"
permission="zope.View"
class=".content_filter.FilterList"
name="published_content.html"
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/configure.zcml
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/configure.zcml 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/configure.zcml 2009-01-29 17:55:54 UTC (rev 95456)
@@ -17,7 +17,7 @@
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
- interface="zope.app.container.interfaces.IReadContainer"
+ interface="zope.container.interfaces.IReadContainer"
/>
</class>
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/contentworkflow.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/contentworkflow.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/contentworkflow.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -28,7 +28,7 @@
from zope.app.workflow.interfaces import IProcessInstanceContainerAdaptable
from zope.app.workflow.stateful.interfaces import IContentWorkflowsManager
from zope.app.workflow.instance import createProcessInstance
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
def NewObjectProcessInstanceCreator(obj, event):
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/definition.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -27,8 +27,8 @@
from zope.lifecycleevent import modified
from zope.traversing.api import getParents
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.contained import Contained, containedEvent
+from zope.container.interfaces import IReadContainer
+from zope.container.contained import Contained, containedEvent
from zope.app.workflow.definition import ProcessDefinition
from zope.app.workflow.definition import ProcessDefinitionElementContainer
from zope.app.workflow.stateful.interfaces import IStatefulProcessDefinition
@@ -234,22 +234,22 @@
return self.get(key) is not None
def __iter__(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return iter(self.keys())
def keys(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return ['states', 'transitions']
def values(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return map(self.get, self.keys())
def items(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return [(key, self.get(key)) for key in self.keys()]
def __len__(self):
- """See zope.app.container.interfaces.IReadContainer"""
+ """See zope.container.interfaces.IReadContainer"""
return 2
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/instance.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/instance.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/instance.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -28,7 +28,7 @@
from zope.app.workflow.stateful.interfaces import IBeforeRelevantDataChangeEvent
from zope.app.workflow.stateful.interfaces import IAfterRelevantDataChangeEvent
from zope.app.workflow.instance import ProcessInstance
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
from zope.component import getUtility, getSiteManager
from zope.event import notify
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_contentworkflow.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -25,7 +25,7 @@
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
from zope.traversing.api import traverse
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
from zope.app.workflow.interfaces import IProcessDefinition
from zope.app.workflow.interfaces import IProcessInstanceContainerAdaptable
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_instance.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_instance.py 2009-01-29 17:46:46 UTC (rev 95455)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/tests/test_instance.py 2009-01-29 17:55:54 UTC (rev 95456)
@@ -42,7 +42,7 @@
from zope.app.workflow.stateful.instance import StatefulProcessInstance
from zope.app.workflow.stateful.instance import StateChangeInfo
-from zope.app.container.contained import contained
+from zope.container.contained import contained
from zope.app.testing import setup
More information about the Checkins
mailing list