Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #19634 -- Added proper __hash__ methods.

Classes overriding __eq__ need a __hash__ such that equal objects have
the same hash.

Thanks akaariai for the report and regebro for the patch.
  • Loading branch information...
commit e76147a83a7306d6d83057b982207ddab37eb942 1 parent 0836670
@aaugustin aaugustin authored
View
3  django/db/backends/__init__.py
@@ -51,7 +51,8 @@ def __eq__(self, other):
def __ne__(self, other):
return not self == other
- __hash__ = object.__hash__
+ def __hash__(self):
+ return hash(self.alias)
def get_connection_params(self):
raise NotImplementedError
View
3  django/db/models/fields/__init__.py
@@ -135,7 +135,8 @@ def __lt__(self, other):
return self.creation_counter < other.creation_counter
return NotImplemented
- __hash__ = object.__hash__
+ def __hash__(self):
+ return hash(self.creation_counter)
def __deepcopy__(self, memodict):
# We don't have to deepcopy very much here, since most things are not
View
1  django/db/models/fields/files.py
@@ -30,7 +30,6 @@ 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
View
3  django/dispatch/saferef.py
@@ -152,7 +152,8 @@ def __str__(self):
__repr__ = __str__
- __hash__ = object.__hash__
+ def __hash__(self):
+ return hash(self.key)
def __bool__( self ):
"""Whether we are still a valid reference"""
View
3  django/test/html.py
@@ -85,7 +85,8 @@ def __eq__(self, element):
return False
return True
- __hash__ = object.__hash__
+ def __hash__(self):
+ return hash((self.name,) + tuple(a for a in self.attributes))
def __ne__(self, element):
return not self.__eq__(element)
View
3  django/utils/functional.py
@@ -152,7 +152,8 @@ def __lt__(self, other):
other = other.__cast()
return self.__cast() < other
- __hash__ = object.__hash__
+ def __hash__(self):
+ return hash(self.__cast())
def __mod__(self, rhs):
if self._delegate_bytes and not six.PY3:
View
24 tests/regressiontests/backends/tests.py
@@ -576,9 +576,11 @@ def test_default_connection_thread_local(self):
different for each thread.
Refs #17258.
"""
- connections_set = set()
+ # Map connections by id because connections with identical aliases
+ # have the same hash.
+ connections_dict = {}
connection.cursor()
- connections_set.add(connection)
+ connections_dict[id(connection)] = connection
def runner():
# Passing django.db.connection between threads doesn't work while
# connections[DEFAULT_DB_ALIAS] does.
@@ -588,19 +590,19 @@ def runner():
# main thread.
connection.allow_thread_sharing = True
connection.cursor()
- connections_set.add(connection)
+ connections_dict[id(connection)] = connection
for x in range(2):
t = threading.Thread(target=runner)
t.start()
t.join()
# Check that each created connection got different inner connection.
self.assertEqual(
- len(set([conn.connection for conn in connections_set])),
+ len(set(conn.connection for conn in connections_dict.values())),
3)
# Finish by closing the connections opened by the other threads (the
# connection opened in the main thread will automatically be closed on
# teardown).
- for conn in connections_set:
+ for conn in connections_dict.values() :
if conn is not connection:
conn.close()
@@ -609,25 +611,27 @@ def test_connections_thread_local(self):
Ensure that the connections are different for each thread.
Refs #17258.
"""
- connections_set = set()
+ # Map connections by id because connections with identical aliases
+ # have the same hash.
+ connections_dict = {}
for conn in connections.all():
- connections_set.add(conn)
+ connections_dict[id(conn)] = conn
def runner():
from django.db import connections
for conn in connections.all():
# Allow thread sharing so the connection can be closed by the
# main thread.
conn.allow_thread_sharing = True
- connections_set.add(conn)
+ connections_dict[id(conn)] = conn
for x in range(2):
t = threading.Thread(target=runner)
t.start()
t.join()
- self.assertEqual(len(connections_set), 6)
+ self.assertEqual(len(connections_dict), 6)
# Finish by closing the connections opened by the other threads (the
# connection opened in the main thread will automatically be closed on
# teardown).
- for conn in connections_set:
+ for conn in connections_dict.values():
if conn is not connection:
conn.close()
Please sign in to comment.
Something went wrong with that request. Please try again.