summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kostakov <bps@dzen.ws>2018-09-13 17:04:36 +0300
committerTim Graham <timograham@gmail.com>2018-09-13 10:04:36 -0400
commitc52ecbda615594750ae59b789313a29893950b3d (patch)
treefa24dacb1339c11d58bf8af76dce6b94c5cf6f07
parent57fd3700d4f5a7887ad3967fe19b61bc9f25b2f3 (diff)
Removed shadowing of built-in hash() function.
-rw-r--r--django/contrib/auth/tokens.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/auth/tokens.py b/django/contrib/auth/tokens.py
index 9aa0a5262a..80fe699395 100644
--- a/django/contrib/auth/tokens.py
+++ b/django/contrib/auth/tokens.py
@@ -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):
"""