[z3-checkins] r28839 - z3/hurry.workflow/trunk/src/hurry/workflow

[faassen at codespeak.net]

Author: faassen
Date: Thu Jun 15 18:42:12 2006
New Revision: 28839

Modified:
   z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py
   z3/hurry.workflow/trunk/src/hurry/workflow/tests.py
   z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py
   z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt
Log:
Fix deprecation warnings.


Modified: z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py
==============================================================================
--- z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py	(original)
+++ z3/hurry.workflow/trunk/src/hurry/workflow/interfaces.py	Thu Jun 15 18:42:12 2006
@@ -1,5 +1,5 @@
 from zope.interface import Interface, Attribute
-from zope.app.event.interfaces import IObjectEvent
+from zope.component.interfaces import IObjectEvent
 
 MANUAL = 0
 AUTOMATIC = 1

Modified: z3/hurry.workflow/trunk/src/hurry/workflow/tests.py
==============================================================================
--- z3/hurry.workflow/trunk/src/hurry/workflow/tests.py	(original)
+++ z3/hurry.workflow/trunk/src/hurry/workflow/tests.py	Thu Jun 15 18:42:12 2006
@@ -2,8 +2,8 @@
 
 from zope.testing import doctest
 from zope.app.testing import placelesssetup, ztapi
-from zope.app.annotation import interfaces as annotation_interfaces
-from zope.app.annotation import attribute
+from zope.annotation import interfaces as annotation_interfaces
+from zope.annotation import attribute
 from hurry.workflow import interfaces, workflow
 
 class WorkflowVersions(workflow.WorkflowVersions):

Modified: z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py
==============================================================================
--- z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py	(original)
+++ z3/hurry.workflow/trunk/src/hurry/workflow/workflow.py	Thu Jun 15 18:42:12 2006
@@ -8,9 +8,10 @@
 from zope.security.checker import CheckerPublic
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotations
 from zope.app.container.contained import Contained
-from zope.app.event.objectevent import ObjectEvent, ObjectModifiedEvent
+from zope.lifecycleevent import ObjectModifiedEvent
+from zope.component.interfaces import ObjectEvent
 
 from hurry.workflow import interfaces
 from hurry.workflow.interfaces import MANUAL, AUTOMATIC, SYSTEM

Modified: z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt
==============================================================================
--- z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt	(original)
+++ z3/hurry.workflow/trunk/src/hurry/workflow/workflow.txt	Thu Jun 15 18:42:12 2006
@@ -11,7 +11,7 @@
 
    >>> from zope.interface import implements, Attribute
  
-   >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+   >>> from zope.annotation.interfaces import IAttributeAnnotatable
    >>> class IDocument(IAttributeAnnotatable):
    ...    title = Attribute('Title')
    >>> class Document(object):