[Checkins] SVN: z3c.blobfile/trunk/ Make blob files/images implement IBlobFile/IBlobImage interfaces respectively.

[Dan Korostelev]

Log message for revision 90927:
  Make blob files/images implement IBlobFile/IBlobImage interfaces respectively.

Changed:
  _U  z3c.blobfile/trunk/
  U   z3c.blobfile/trunk/CHANGES.txt
  _U  z3c.blobfile/trunk/src/
  U   z3c.blobfile/trunk/src/z3c/blobfile/file.py
  U   z3c.blobfile/trunk/src/z3c/blobfile/image.py
  U   z3c.blobfile/trunk/src/z3c/blobfile/tests.py

-=-

Property changes on: z3c.blobfile/trunk
___________________________________________________________________
Name: svn:ignore
   + bin
parts
.installed.cfg


Modified: z3c.blobfile/trunk/CHANGES.txt
===================================================================
--- z3c.blobfile/trunk/CHANGES.txt	2008-09-08 06:55:51 UTC (rev 90926)
+++ z3c.blobfile/trunk/CHANGES.txt	2008-09-08 07:13:27 UTC (rev 90927)
@@ -2,10 +2,11 @@
 CHANGES
 =======
 
-Version 0.2.0 (unreleased)
+Version 0.1.1 (unreleased)
 --------------------------
 
-- 
+- Bug: Make blob versions of File and Image implement IBlobFile and
+  IBlobImage interfaces respectively.
 
 Version 0.1.0 (2008-02-27)
 --------------------------


Property changes on: z3c.blobfile/trunk/src
___________________________________________________________________
Name: svn:ignore
   + *.egg-info


Modified: z3c.blobfile/trunk/src/z3c/blobfile/file.py
===================================================================
--- z3c.blobfile/trunk/src/z3c/blobfile/file.py	2008-09-08 06:55:51 UTC (rev 90926)
+++ z3c.blobfile/trunk/src/z3c/blobfile/file.py	2008-09-08 07:13:27 UTC (rev 90927)
@@ -20,7 +20,6 @@
 import zope.component
 import zope.component.interfaces
 import zope.app.publication.interfaces
-import zope.app.file.interfaces
 
 from ZODB.blob import Blob
 
@@ -30,7 +29,7 @@
     """A persistent content component storing binary file data."""
 
     implements(zope.app.publication.interfaces.IFileContent, 
-               zope.app.file.interfaces.IFile)
+               interfaces.IBlobFile)
 
     size = 0
     

Modified: z3c.blobfile/trunk/src/z3c/blobfile/image.py
===================================================================
--- z3c.blobfile/trunk/src/z3c/blobfile/image.py	2008-09-08 06:55:51 UTC (rev 90926)
+++ z3c.blobfile/trunk/src/z3c/blobfile/image.py	2008-09-08 07:13:27 UTC (rev 90927)
@@ -24,14 +24,15 @@
 
 from z3c.blobfile.i18n import ZopeMessageFactory as _
 from z3c.blobfile.file import File
-from zope.app.file.interfaces import IImage
 
 from ZODB.blob import Blob
 
+import interfaces
+
 IMAGE_INFO_BYTES = 1024
 
 class Image(File):
-    implements(IImage)
+    implements(interfaces.IBlobImage)
 
     def __init__(self, data=''):
         '''See interface `IFile`'''

Modified: z3c.blobfile/trunk/src/z3c/blobfile/tests.py
===================================================================
--- z3c.blobfile/trunk/src/z3c/blobfile/tests.py	2008-09-08 06:55:51 UTC (rev 90926)
+++ z3c.blobfile/trunk/src/z3c/blobfile/tests.py	2008-09-08 07:13:27 UTC (rev 90927)
@@ -19,6 +19,7 @@
 from zope.app.file.interfaces import IImage
 from z3c.blobfile.image import Image, FileFactory, ImageSized, getImageInfo
 from z3c.blobfile.file import File, FileWriteFile, FileReadFile
+from z3c.blobfile.interfaces import IBlobFile, IBlobImage
 
 import testing
 import storages
@@ -70,6 +71,9 @@
     def testInterface(self):
         self.failUnless(IImage.implementedBy(Image))
         self.failUnless(verifyClass(IImage, Image))
+        self.failUnless(IBlobFile.implementedBy(Image))
+        self.failUnless(IBlobImage.implementedBy(Image))
+        self.failUnless(verifyClass(IBlobFile, Image))
 
 class TestFileAdapters(unittest.TestCase):