[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - File.py:1.1.2.9 NaiveFile.py:1.1.2.6 file.zcml:1.1.2.5

[Steve Alexander]

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

Modified Files:
      Tag: Zope-3x-branch
	File.py NaiveFile.py file.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/File/File.py 1.1.2.8 => 1.1.2.9 ===
 from FileChunk import FileChunk
 from IFile import IFile
-from Zope.App.OFS.Annotation.IAttributeAnnotatable import IAttributeAnnotatable
 
 # set the size of the chunks
 MAXCHUNKSIZE = 1 << 16
@@ -28,11 +27,7 @@
 class File(Persistence.Persistent):
     """ """
 
-    __implements__ = (
-        IFile,
-        IAttributeAnnotatable,
-        )      
-
+    __implements__ = IFile
 
     def __init__(self, data='', contentType=None):
         """ """


=== Zope3/lib/python/Zope/App/OFS/Content/File/NaiveFile.py 1.1.2.5 => 1.1.2.6 ===
 import Persistence
 from IFile import IFile
-from Zope.App.OFS.Annotation.IAttributeAnnotatable import IAttributeAnnotatable
+from Zope.App.OFS.Annotation.IAnnotatable import IAnnotatable
 
 
 _RAISE_KEYERROR = []
@@ -33,7 +33,7 @@
 
     __implements__ = (
         IFile,
-        IAttributeAnnotatable)
+        IAnnotatable)
 
 
     def __init__(self, data='', contentType=None):


=== Zope3/lib/python/Zope/App/OFS/Content/File/file.zcml 1.1.2.4 => 1.1.2.5 ===
   </security:protectClass>
 
+
+<adapter
+    factory="Zope.App.OFS.Annotation.AttributeAnnotations."
+    provides="Zope.App.OFS.Annotation.IAnnotations."
+    for=".IFile." />
+
+
   <!-- tabs for folder -->
 
   <zmi:tabs for=".IFile.">