test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #9508 -- Added an appropriate FileField.__hash__ implementation. 

Required because we declare a custom __eq__ method.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2009-03-08 09:59:17 +00:00
parent d01c17e81d
commit 6e415a5f90
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/fields/files.py
View File

@ -34,6 +34,10 @@ class FieldFile(File):
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(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 # The standard File contains most of the necessary properties, but
# FieldFiles can be instantiated without a name, so that needs to # FieldFiles can be instantiated without a name, so that needs to
# be checked for here. # be checked for here.

5
tests/regressiontests/file_storage/models.py
View File

@ -54,6 +54,11 @@ False
>>> p.mugshot != p1.mugshot >>> p.mugshot != p1.mugshot
True 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. # Bug #8175: correctly delete files that have been removed off the file system.
>>> import os >>> import os
>>> p2 = Person(name="Fred") >>> p2 = Person(name="Fred")