[Zope3-checkins] CVS: Zope3/src/zope/app/dublincore - configure.zcml:1.3.16.1 creatorannotator.py:1.3.2.1 timeannotators.py:1.3.26.1 zopedublincore.py:1.3.24.1 general.py:NONE

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/dublincore
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/dublincore

Modified Files:
      Tag: cw-mail-branch
	configure.zcml creatorannotator.py timeannotators.py 
	zopedublincore.py 
Removed Files:
      Tag: cw-mail-branch
	general.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/dublincore/configure.zcml 1.3 => 1.3.16.1 ===
--- Zope3/src/zope/app/dublincore/configure.zcml:1.3	Thu Mar 27 07:51:46 2003
+++ Zope3/src/zope/app/dublincore/configure.zcml	Sun Jun 22 10:22:59 2003
@@ -4,9 +4,16 @@
 >
 
   <adapter
-      factory="zope.app.dublincore.annotatableadapter.ZDCAnnotatableAdapter"
-      provides="zope.app.interfaces.dublincore.IZopeDublinCore"
-      for="zope.app.interfaces.annotation.IAnnotatable" />
+      factory=".annotatableadapter.ZDCAnnotatableAdapter"
+      provides="zope.app.interfaces.dublincore.IWriteZopeDublinCore"
+      for="zope.app.interfaces.annotation.IAnnotatable"
+      />
+
+  <class class=".annotatableadapter.ZDCAnnotatableAdapter">
+    <require permission="zope.View"
+             interface="zope.app.interfaces.dublincore.IZopeDublinCore"
+             />
+  </class>
 
   <event:subscribe 
       subscriber = ".timeannotators.ModifiedAnnotator"
@@ -20,6 +27,8 @@
 
   <event:subscribe
     subscriber=".creatorannotator.CreatorAnnotator"
-    event_types="zope.app.interfaces.event.IObjectModifiedEvent zope.app.interfaces.event.IObjectCreatedEvent"/>
+    event_types="zope.app.interfaces.event.IObjectModifiedEvent 
+                 zope.app.interfaces.event.IObjectCreatedEvent"
+    />
 
 </zopeConfigure>


=== Zope3/src/zope/app/dublincore/creatorannotator.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zope/app/dublincore/creatorannotator.py:1.3	Wed May 21 13:26:38 2003
+++ Zope3/src/zope/app/dublincore/creatorannotator.py	Sun Jun 22 10:22:59 2003
@@ -21,11 +21,12 @@
 from zope.app.interfaces.dublincore import IZopeDublinCore
 from zope.app.interfaces.event import ISubscriber
 from zope.security.management import getSecurityManager
+from zope.interface import implements
 
 class CreatorAnnotatorClass:
     """Update Dublin-Core creator property
     """
-    __implements__ = ISubscriber
+    implements(ISubscriber)
 
     def notify(self, event):
         dc = queryAdapter(event.object, IZopeDublinCore)


=== Zope3/src/zope/app/dublincore/timeannotators.py 1.3 => 1.3.26.1 ===
--- Zope3/src/zope/app/dublincore/timeannotators.py:1.3	Mon Dec 30 09:03:00 2002
+++ Zope3/src/zope/app/dublincore/timeannotators.py	Sun Jun 22 10:22:59 2003
@@ -21,11 +21,12 @@
 from zope.component import queryAdapter
 from zope.app.interfaces.dublincore import IZopeDublinCore
 from zope.app.interfaces.event import ISubscriber
+from zope.interface import implements
 
 class DCTimeAnnotatorClass:
     """Update Dublin-Core time property
     """
-    __implements__ = ISubscriber
+    implements(ISubscriber)
 
     def __init__(self, property):
         self.property = property


=== Zope3/src/zope/app/dublincore/zopedublincore.py 1.3 => 1.3.24.1 ===
--- Zope3/src/zope/app/dublincore/zopedublincore.py:1.3	Wed Jan  8 15:18:28 2003
+++ Zope3/src/zope/app/dublincore/zopedublincore.py	Sun Jun 22 10:22:59 2003
@@ -20,6 +20,7 @@
 from zope.app.interfaces.dublincore import IZopeDublinCore
 from zope.app.datetimeutils import parseDatetimetz
 from datetime import datetime
+from zope.interface import implements
 
 class SimpleProperty:
 
@@ -97,8 +98,7 @@
     Just mix with Persistence to get a persistent version.
     """
 
-
-    __implements__ =  IZopeDublinCore
+    implements(IZopeDublinCore)
 
     def __init__(self, mapping=None):
         if mapping is None:

=== Removed File Zope3/src/zope/app/dublincore/general.py ===