Changeset 6284

Timestamp:

6 Jun 2011, 02:31:41 (13 years ago)

Author:

uli

Message:

Fix bug #32.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/image/image.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/image/image.py

@@ -23 +23 @@
 Components for handling image files.
 """
+from StringIO import StringIO
 from hurry.file import HurryFile
+from hurry.file.interfaces import IFileRetrieval
+from zope.component import queryUtility
 from zope.interface import implements
 from waeup.sirp.image.interfaces import IWAeUPImageFile
@@ -33 +36 @@
     """
     implements(IWAeUPImageFile)
+
+    def _get_file(self):
+        """Get the real file.
+
+        We have to override this method from
+        :class:`hurry.file.HurryFile` base because we need a more
+        careful utility lookup.
+        """
+        storage = queryUtility(IFileRetrieval)
+        if storage is None:
+            # can happen on startup, see https://trac.waeup.org/ticket/32
+            return StringIO(self.data)
+        return storage.getFile(self.data)
+
+    file = property(_get_file)