Changeset 12426 for main/waeup.kofa/trunk/src

Timestamp:

8 Jan 2015, 14:25:54 (10 years ago)

Author:

uli

Message:

Make tests work again.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/schoolgrades.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/schoolgrades.py

@@ -29 +29 @@
 
 
+#: A unique default value.
+DEFAULT_VALUE = object()
+
+
 class ResultEntry(grok.Model):
     """A result entry contains a subject and a grade.
@@ -45 +49 @@
 
     def __eq__(self, obj):
-        default = object()
-        result = []
+        """Two ResultEntry objects are equal if their `subject` and
+           `grade` are equal.
+        """
         for name in ('subject', 'grade',):
-            result.append(
-                getattr(self, name) == getattr(obj, name, default))
-        return False not in result
+            if getattr(self, name) != getattr(obj, name, DEFAULT_VALUE):
+                return False
+        return True
+
+    def __ne__(self, other):
+        """Two ResultEntries are not equal, if their equality test fails.
+
+        a != b <-> not(a == b). Python doc tell, that __ne__ should
+        also be rovided, whenever __eq__ is implemented.
+        """
+        return not self.__eq__(other)
 
     def to_string(self):