[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image - Image.py:1.5 configure.zcml:1.8

[Martijn Faassen]

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

Modified Files:
	Image.py configure.zcml 
Log Message:
Got rid of separate Schema class; just use interfaces now. Updated
Forms and content objects to reflect this change.


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Image.py 1.4 => 1.5 ===
 
 from Zope.App.OFS.Content.File.File import File
 from Zope.App.OFS.Content.File.IFile import IFile
-from Zope.App.OFS.Content.File.SFile import SFile
 from Zope.App.OFS.Annotation.IAnnotatable import IAnnotatable
 from cStringIO import StringIO
 
@@ -30,13 +29,8 @@
         """Return a tuple (x, y) that describes the dimensions of
         the object."""
 
-    
-class SImage(SFile):
-    """Image properties."""
-
-
 class Image(File):
-    __implements__ = (SImage, IImage, IAnnotatable,)
+    __implements__ = IImage, IAnnotatable
 
     def __init__(self, data=None):
         '''See interface Zope.App.OFS.Content.File.IFile.IFile'''
@@ -58,7 +52,6 @@
         '''See interface IImage'''
         return (self._width, self._height)
 
-    # See schema Zope.App.OFS.File.SFile.SFile
     data = property(File.getData, setData, None,
                     """Contains the data of the file.""")
 


=== Zope3/lib/python/Zope/App/OFS/Content/Image/configure.zcml 1.7 => 1.8 ===
         permission="Zope.View"
         interface=".Image.IImage" />
     <require
-        permission="Zope.View"
-        interface=".Image.SImage" />
-    <require
         permission="Zope.ManageContent"
         interface="Zope.App.OFS.Content.File.IFile.IWriteFile" />
   </content>