Changeset 6584 for main

Timestamp:

8 Aug 2011, 19:18:30 (13 years ago)

Author:

uli

Message:

Fix bug in hurry.file.

Location:

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

Files:

• README.txt (modified) (1 diff)
• image.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt

@@ -194 +194 @@
   TooSmall: ('bar.jpg', '4 bytes (min: 5 bytes)')
 
+
+Broken Unequality Comparison
+----------------------------
+
+WAeUPImageFile does not reproduce the broken unequal comparison from
+its base:
+
+  >>> f1 = WAeUPImageFile('bar.jpg', '123456789')
+  >>> f2 = WAeUPImageFile('bar.jpg', '123456789')
+  >>> f3 = WAeUPImageFile('baz.jpg', '1234')
+  >>> f1 == f2
+  True
+
+  >>> f1 != f2
+  False
+
+  >>> f1 == f3
+  False
+
+  >>> f1 != f3
+  True

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

@@ -41 +41 @@
     implements(IWAeUPImageFile)
 
+    def __ne__(self, other):
+        # This was wrongly implemented in the base class
+        try:
+            return (self.filename != other.filename or
+                    self.data != other.data)
+        except AttributeError:
+            return True
+
 def createWAeUPImageFile(filename, f):
     retrieval = getUtility(IFileRetrieval)