Pull from upstream/main and resolve conflicts.

1 files changed, 3 insertions, 3 deletions

diff --git a/pydis_site/apps/resources/tests/test_views.py b/pydis_site/apps/resources/tests/test_views.py
index 53685eef..3ad0b958 100644
--- a/pydis_site/apps/resources/tests/test_views.py
+++ b/pydis_site/apps/resources/tests/test_views.py
@@ -3,7 +3,7 @@ from unittest.mock import patch
 
 from django.conf import settings
 from django.test import TestCase
-from django_hosts import reverse
+from django.urls import reverse
 
 TESTING_RESOURCES_PATH = Path(
     settings.BASE_DIR, "pydis_site", "apps", "resources", "tests", "testing_resources"
@@ -22,13 +22,13 @@ class TestResourcesListView(TestCase):
     @patch("pydis_site.apps.resources.views.resources_list.RESOURCES_PATH", TESTING_RESOURCES_PATH)
     def test_valid_resource_list_200(self):
         """Check does site return code 200 when visiting valid resource list."""
-        url = reverse("resources:resources", ("testing",))
+        url = reverse("resources:resources", args=("testing",))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     @patch("pydis_site.apps.resources.views.resources_list.RESOURCES_PATH", TESTING_RESOURCES_PATH)
     def test_invalid_resource_list_404(self):
         """Check does site return code 404 when trying to visit invalid resource list."""
-        url = reverse("resources:resources", ("invalid",))
+        url = reverse("resources:resources", args=("invalid",))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)