[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image - Image.py:1.1.2.7 image.zcml:1.1.2.6

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Image
In directory cvs.zope.org:/tmp/cvs-serv6102/lib/python/Zope/App/OFS/Content/Image

Modified Files:
      Tag: Zope-3x-branch
	Image.py image.zcml 
Log Message:
Security-related management screens now work!

I've had to change the way use of Annotations is declared in classes
a little bit. I'll explain more about that in an email to
zope3-dev shortly.


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Image.py 1.1.2.6 => 1.1.2.7 ===
 
 from Zope.App.OFS.Content.File.File import IFile, File
-from Zope.App.OFS.Annotation.IAttributeAnnotatable import IAttributeAnnotatable
+from Zope.App.OFS.Annotation.IAnnotatable import IAnnotatable
 from StringIO import StringIO
 
 
@@ -38,7 +38,7 @@
 
     __implements__ = (
         IImage,
-        IAttributeAnnotatable,
+        IAnnotatable,
         )
 
     def __init__(self, data=None):


=== Zope3/lib/python/Zope/App/OFS/Content/Image/image.zcml 1.1.2.5 => 1.1.2.6 ===
   </security:protectClass>
 
+  <adapter
+      factory="Zope.App.OFS.Annotation.AttributeAnnotations."
+      provides="Zope.App.OFS.Annotation.IAnnotations."
+      for=".Image." />
+
   <!-- tabs for image -->
 
   <zmi:tabs for=".Image.IImage.">