[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/ Fix up zwiki, bugtracker, buddydemo, z3checkins after moving zope.app.annotation

Philipp von Weitershausen philikon at philikon.de
Thu Apr 6 14:55:22 EDT 2006


Log message for revision 66603:
  Fix up zwiki, bugtracker, buddydemo, z3checkins after moving zope.app.annotation
  to zope.annotation.
  

Changed:
  U   Zope3/branches/jim-adapter/src/buddydemo/configure.zcml
  U   Zope3/branches/jim-adapter/src/bugtracker/bug.py
  U   Zope3/branches/jim-adapter/src/bugtracker/configure.zcml
  U   Zope3/branches/jim-adapter/src/bugtracker/mail.py
  U   Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
  U   Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py
  U   Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py
  U   Zope3/branches/jim-adapter/src/bugtracker/tests/test_vocabularies.py
  U   Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py
  U   Zope3/branches/jim-adapter/src/z3checkins/configure.zcml
  U   Zope3/branches/jim-adapter/src/zwiki/configure.zcml
  U   Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py
  U   Zope3/branches/jim-adapter/src/zwiki/tests/test_wikimail.py
  U   Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py
  U   Zope3/branches/jim-adapter/src/zwiki/wikipage.py

-=-
Modified: Zope3/branches/jim-adapter/src/buddydemo/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/buddydemo/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/buddydemo/configure.zcml	2006-04-06 18:55:20 UTC (rev 66603)
@@ -9,7 +9,7 @@
 
 <class class=".buddy.Buddy">
    <implements 
-       interface="zope.app.annotation.IAttributeAnnotatable" />
+       interface="zope.annotation.IAttributeAnnotatable" />
    <require permission="zope.View"
             interface=".interfaces.IBuddy" />
    <require permission="zope.ManageContent"

Modified: Zope3/branches/jim-adapter/src/bugtracker/bug.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/bug.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/bug.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -17,9 +17,9 @@
 """
 from zope.interface import implements
 from zope.proxy import removeAllProxies
+from zope.annotation.interfaces import IAnnotations
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.container.btree import BTreeContainer
 from zope.app.container.contained import contained
 from zope.app.dublincore.interfaces import IZopeDublinCore

Modified: Zope3/branches/jim-adapter/src/bugtracker/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/configure.zcml	2006-04-06 18:55:20 UTC (rev 66603)
@@ -172,7 +172,7 @@
   <class class=".tracker.BugTracker">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+       interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <factory
         id="bugtracker.BugTracker"
@@ -242,7 +242,7 @@
   <class class=".bug.Bug">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"/>
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"/>
 
     <factory
         id="bugtracker.Bug"
@@ -322,7 +322,7 @@
   <class class=".comment.Comment">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"/>
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"/>
 
     <factory
         id="bugtracker.BugComment"

Modified: Zope3/branches/jim-adapter/src/bugtracker/mail.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/mail.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/mail.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -16,9 +16,9 @@
 $Id$
 """
 from zope.interface import implements
+from zope.annotation.interfaces import IAnnotations
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.event.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
 from zope.app.mail.interfaces import IMailDelivery
 

Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/placelesssetup.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -32,14 +32,14 @@
 from zope.traversing.adapters import DefaultTraversable, Traverser
 from zope.location.interfaces import ILocation
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup as SetupBase
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.file import File
 from zope.app.container.interfaces import INameChooser
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 from zope.app.dublincore.interfaces import IWriteZopeDublinCore
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.renderer.plaintext import IPlainTextSource

Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_dependencies.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -17,32 +17,26 @@
 """
 import unittest
 
-from zope.interface import classImplements
+import zope.component
 from zope.component.testing import PlacelessSetup
-from zope.traversing.interfaces import IPhysicallyLocatable
-from zope.location.interfaces import ILocation
+from zope.interface import classImplements
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
-from zope.app.testing import ztapi
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
-
 from bugtracker.interfaces import IBug, IBugDependencies
 from bugtracker.bug import Bug, BugDependencyAdapter
 from bugtracker.tracker import BugTracker
 
-
 class DependencyTest(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
         super(DependencyTest, self).setUp()
         classImplements(Bug, IAttributeAnnotatable);
-        ztapi.provideAdapter(IAttributeAnnotatable, IAnnotations,
-                             AttributeAnnotations)
-        ztapi.provideAdapter(IBug, IBugDependencies,
-                             BugDependencyAdapter)
-        ztapi.provideAdapter(ILocation, IPhysicallyLocatable,
-                             LocationPhysicallyLocatable)
+        zope.component.provideAdapter(AttributeAnnotations)
+        zope.component.provideAdapter(BugDependencyAdapter, (IBug,),
+                                      IBugDependencies)
+        zope.component.provideAdapter(LocationPhysicallyLocatable)
 
         self.bug = Bug()
 

Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_mail.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -22,10 +22,10 @@
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.location.interfaces import ILocation
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app.testing import ztapi
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.dublincore.interfaces import IWriteZopeDublinCore
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.app.event.objectevent import ObjectModifiedEvent

Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_vocabularies.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_vocabularies.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_vocabularies.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -20,12 +20,11 @@
 from zope.interface import classImplements, implements
 from zope.schema.interfaces import ITokenizedTerm
 from zope.schema.vocabulary import getVocabularyRegistry
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 
-from zope.app import zapi
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 from zope.app.container.contained import contained, Contained
 from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
 from zope.app.security.principalregistry import principalRegistry, Principal

Modified: Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/bugtracker/vocabulary.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -23,10 +23,10 @@
 from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
 from zope.schema.vocabulary import getVocabularyRegistry
 from zope.security.proxy import removeSecurityProxy 
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
 
 from zope.app import zapi
 from zope.app.schema.interfaces import IVocabularyFactory
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
 
 from bugtracker.interfaces import IManagableVocabulary, IBugTracker
 from bugtracker.interfaces import IStatusVocabulary

Modified: Zope3/branches/jim-adapter/src/z3checkins/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/z3checkins/configure.zcml	2006-04-06 18:55:20 UTC (rev 66603)
@@ -11,7 +11,7 @@
              interface=".interfaces.IMessage" />
 
     <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+      interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
   </class>
 
@@ -21,7 +21,7 @@
              interface=".interfaces.ICheckinMessage" />
 
     <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+      interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
   </class>
 
@@ -47,7 +47,7 @@
               description="A checkin folder" />
 
      <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+       interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zwiki/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/zwiki/configure.zcml	2006-04-06 18:55:20 UTC (rev 66603)
@@ -89,7 +89,7 @@
   <class class=".wiki.Wiki">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+       interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <factory
         id="zwiki.Wiki"
@@ -144,7 +144,7 @@
   <class class=".wikipage.WikiPage">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+       interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <factory
         id="zwiki.WikiPage"
@@ -189,7 +189,7 @@
   <class class=".comment.Comment">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+       interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <factory
         id="zwiki.Comment"

Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_traverser.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -23,9 +23,9 @@
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.location.interfaces import ILocation
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 
-from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
 

Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_wikimail.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_wikimail.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_wikimail.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -15,19 +15,19 @@
 
 $Id$
 """
+import unittest
 import email
 from email.Header import decode_header
 
-import unittest
-
 from zope.event import subscribers
 from zope.interface import classImplements, implements 
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
+
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.app.site.tests.placefulsetup import PlacefulSetup
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
 from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.mail.interfaces import IMailDelivery
 
 from zwiki.interfaces import IWikiPage, IWiki, IMailSubscriptions

Modified: Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/zwiki/tests/test_wikipagehierarchy.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -21,10 +21,10 @@
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.location.interfaces import ILocation
 from zope.location.traversing import LocationPhysicallyLocatable
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app.testing import ztapi
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.site.tests.placefulsetup import PlacefulSetup
 
 from zwiki.interfaces import IWikiPage, IWikiPageHierarchy

Modified: Zope3/branches/jim-adapter/src/zwiki/wikipage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zwiki/wikipage.py	2006-04-06 18:53:27 UTC (rev 66602)
+++ Zope3/branches/jim-adapter/src/zwiki/wikipage.py	2006-04-06 18:55:20 UTC (rev 66603)
@@ -25,6 +25,8 @@
 from zope.interface import implements
 from zope.event import notify
 from zope.schema.vocabulary import getVocabularyRegistry
+from zope.annotation.interfaces import IAnnotations
+from zope.component.interfaces import ObjectEvent
 
 from zope.app import zapi
 from zope.app.container.btree import BTreeContainer
@@ -33,8 +35,6 @@
 from zope.app.filerepresentation.interfaces import IWriteFile
 from zope.app.filerepresentation.interfaces import IReadDirectory
 from zope.app.filerepresentation.interfaces import IWriteDirectory
-from zope.app.annotation.interfaces import IAnnotations
-from zope.component.interfaces import ObjectEvent
 from zope.app.container.interfaces import \
      IObjectAddedEvent, IObjectRemovedEvent
 from zope.app.mail.interfaces import IMailDelivery



More information about the Zope3-Checkins mailing list