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

Removed shadowing of built-in hash() function.

This commit is contained in:
Andrey Kostakov 2018-09-13 17:04:36 +03:00 committed by Tim Graham
parent 57fd3700d4
commit c52ecbda61
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/auth/tokens.py
View File

@ -28,7 +28,7 @@ class PasswordResetTokenGenerator:
return False return False
# Parse the token # Parse the token
try: try:
ts_b36, hash = token.split("-") ts_b36, _ = token.split("-")
except ValueError: except ValueError:
return False return False
@ -55,12 +55,12 @@ class PasswordResetTokenGenerator:
# timestamp is number of days since 2001-1-1. Converted to # timestamp is number of days since 2001-1-1. Converted to
# base 36, this gives us a 3 digit string until about 2121 # base 36, this gives us a 3 digit string until about 2121
ts_b36 = int_to_base36(timestamp) ts_b36 = int_to_base36(timestamp)
hash = salted_hmac( hash_string = salted_hmac(
self.key_salt, self.key_salt,
self._make_hash_value(user, timestamp), self._make_hash_value(user, timestamp),
secret=self.secret, secret=self.secret,
).hexdigest()[::2] # Limit to 20 characters to shorten the URL. ).hexdigest()[::2] # Limit to 20 characters to shorten the URL.
return "%s-%s" % (ts_b36, hash) return "%s-%s" % (ts_b36, hash_string)
def _make_hash_value(self, user, timestamp): def _make_hash_value(self, user, timestamp):
""" """