Changeset 7132

Timestamp:

02/18/08 19:59:34 (5 months ago)

Author:

mtredinnick

Message:

Fixed #2936, #6500 -- Added a hash() method to Models (since we implement our own eq method).

Files:

• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/tests/modeltests/basic/models.py (modified) (2 diffs)

django/trunk/django/db/models/base.py

@@ -135 +135 @@
-    def __ne__(self, other):
-        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash(self._get_pk_val())
-
-    def __init__(self, *args, **kwargs):

django/trunk/tests/modeltests/basic/models.py

@@ -5 +5 @@
-This is a basic model with only two non-primary-key fields.
-"""
+
+try:
+    set
+except NameError:
+    from sets import Set as set
-
-from django.db import models
@@ -390 +395 @@
->>> Article.objects.get(pk=a.id).headline
-u'\u6797\u539f \u3081\u3050\u307f'
+
+# Model instances have a hash function, so they can be used in sets or as
+# dictionary keys. Two models compare as equal if their primary keys are equal.
+>>> s = set([a10, a11, a12])
+>>> Article.objects.get(headline='Article 11') in s
+True
-"""