mirror of
https://github.com/django/django.git
synced 2024-12-22 17:16:24 +00:00
Removed shadowing of built-in hash() function.
This commit is contained in:
parent
57fd3700d4
commit
c52ecbda61
@ -28,7 +28,7 @@ class PasswordResetTokenGenerator:
|
||||
return False
|
||||
# Parse the token
|
||||
try:
|
||||
ts_b36, hash = token.split("-")
|
||||
ts_b36, _ = token.split("-")
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
@ -55,12 +55,12 @@ class PasswordResetTokenGenerator:
|
||||
# timestamp is number of days since 2001-1-1. Converted to
|
||||
# base 36, this gives us a 3 digit string until about 2121
|
||||
ts_b36 = int_to_base36(timestamp)
|
||||
hash = salted_hmac(
|
||||
hash_string = salted_hmac(
|
||||
self.key_salt,
|
||||
self._make_hash_value(user, timestamp),
|
||||
secret=self.secret,
|
||||
).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):
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user