Skip to content

Commit 3558676

Browse files
committed
Upgrade to django 4.2
1 parent 1b50c89 commit 3558676

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

apps/db_data/tests.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ def test_update_or_create_officer_failure(self):
8888
response = self.client.get(url)
8989
self.assertEqual(response.status_code, 200)
9090
response = self.client.post(url, data={"username": "pnunez"}, follow=True)
91-
self.assertFormError(response, "form", None, ["User pnunez is not in LDAP"])
91+
self.assertFormError(
92+
response.context["form"], None, ["User pnunez is not in LDAP"]
93+
)
9294
response = self.client.post(url, data={"username": "cnunez"}, follow=True)
9395
self.assertContains(response, "User cnunez created")
9496
self.assertContains(response, "Person cnunez created")

apps/newuser/tokens.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ class NewUserTokenGenerator(PasswordResetTokenGenerator):
99
def _make_hash_value(self, email, timestamp):
1010
return str(email) + str(email_exists(email)) + str(timestamp)
1111

12-
def _make_token_with_timestamp(self, email, timestamp):
12+
def _make_token_with_timestamp(self, email, timestamp, secret):
1313
ts_b36 = int_to_base36(timestamp)
1414

1515
hash = salted_hmac(
16-
self.key_salt, self._make_hash_value(email, timestamp)
16+
self.key_salt,
17+
self._make_hash_value(email, timestamp),
18+
secret=self.secret,
19+
algorithm=self.algorithm,
1720
).hexdigest()[::2]
1821
return "%s-%s" % (ts_b36, hash)
1922

poetry.lock

+22-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = []
66
readme = "README.md"
77
requires-python = ">=3.9"
88
dependencies = [
9-
"django (==3.2)",
9+
"django (==4.2)",
1010
"django-markdown-deux (>=1.0.6,<2.0.0)",
1111
"pillow (>=11.2.1,<12.0.0)",
1212
"sorl-thumbnail (==12.10.0)",

0 commit comments

Comments
 (0)