Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.x] Fixed #9508 -- Added an appropriate FileField.__hash__ implem…

…entation.

Required because we declare a custom __eq__ method.

Backport of r9997 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 055c01103de70b1f08321b1dbbcbc4da84821a79 1 parent 244bb7e
@malcolmt malcolmt authored
View
4 django/db/models/fields/files.py
@@ -32,6 +32,10 @@ def __eq__(self, other):
def __ne__(self, other):
return not self.__eq__(other)
+ def __hash__(self):
+ # Required because we defined a custom __eq__.
+ return hash(self.name)
+
# The standard File contains most of the necessary properties, but
# FieldFiles can be instantiated without a name, so that needs to
# be checked for here.
View
5 tests/regressiontests/file_storage/models.py
@@ -54,6 +54,11 @@ class Person(models.Model):
>>> p.mugshot != p1.mugshot
True
+Bug #9508: Similarly to the previous test, make sure hash() works as expected
+(equal items must hash to the same value).
+>>> hash(p.mugshot) == hash(p2.mugshot)
+True
+
# Bug #8175: correctly delete files that have been removed off the file system.
>>> import os
>>> p2 = Person(name="Fred")

0 comments on commit 055c011

Please sign in to comment.
Something went wrong with that request. Please try again.