mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-24 20:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merged hash() calls.

Browse source 
Thanks Simon Charette for the review.
This commit is contained in:
Mariusz Felisiak 2017-09-28 18:12:48 +02:00 • committed by Tim Graham
parent fc6528b25a
commit 2b5a511bd9
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django/db/models/expressions.py
View file

@ -375,10 +375,7 @@ class BaseExpression:
def __hash__(self):
path, args, kwargs = self.deconstruct()
h = hash(path) ^ hash(args)
for kwarg in kwargs.items():
h ^= hash(kwarg)
return h
return hash((path,) + args + tuple(kwargs.items()))
class Expression(BaseExpression, Combinable):
@ -689,10 +686,7 @@ class RawSQL(Expression):
return [self]
def __hash__(self):
h = hash(self.sql) ^ hash(self.output_field)
for param in self.params:
h ^= hash(param)
return h
return hash((self.sql, self.output_field) + tuple(self.params))
class Star(Expression):