Skip to content

Commit 4998984

Browse files
HassanAbouelelajchristgit
authored andcommitted
Fix Unittest Deprecation Warnings
Signed-off-by: Hassan Abouelela <[email protected]>
1 parent cb40bab commit 4998984

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

pydis_site/apps/api/tests/test_filterlists.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def test_returns_filter_list_types(self):
6464

6565
self.assertEqual(response.status_code, 200)
6666
for api_type, model_type in zip(response.json(), FilterList.FilterListType.choices):
67-
self.assertEquals(api_type[0], model_type[0])
68-
self.assertEquals(api_type[1], model_type[1])
67+
self.assertEqual(api_type[0], model_type[0])
68+
self.assertEqual(api_type[1], model_type[1])
6969

7070

7171
class CreationTests(AuthenticatedAPITestCase):

pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ class AocCompletionistBlockViewSet(
7070
serializer_class = AocCompletionistBlockSerializer
7171
queryset = AocCompletionistBlock.objects.all()
7272
filter_backends = (DjangoFilterBackend,)
73-
filter_fields = ("user__id", "is_blocked")
73+
filterset_fields = ("user__id", "is_blocked")

pydis_site/apps/api/viewsets/bot/aoc_link.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ class AocAccountLinkViewSet(
6868
serializer_class = AocAccountLinkSerializer
6969
queryset = AocAccountLink.objects.all()
7070
filter_backends = (DjangoFilterBackend,)
71-
filter_fields = ("user__id", "aoc_username")
71+
filterset_fields = ("user__id", "aoc_username")

pydis_site/apps/api/viewsets/bot/infraction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class InfractionViewSet(
154154
queryset = Infraction.objects.all()
155155
pagination_class = LimitOffsetPaginationExtended
156156
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
157-
filter_fields = ('user__id', 'actor__id', 'active', 'hidden', 'type')
157+
filterset_fields = ('user__id', 'actor__id', 'active', 'hidden', 'type')
158158
search_fields = ('$reason',)
159159
frozen_fields = ('id', 'inserted_at', 'type', 'user', 'actor', 'hidden')
160160

pydis_site/apps/api/viewsets/bot/nomination.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
172172
serializer_class = NominationSerializer
173173
queryset = Nomination.objects.all()
174174
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
175-
filter_fields = ('user__id', 'active')
175+
filterset_fields = ('user__id', 'active')
176176
frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')
177177
frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed')
178178

pydis_site/apps/api/viewsets/bot/reminder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ class ReminderViewSet(
125125
serializer_class = ReminderSerializer
126126
queryset = Reminder.objects.prefetch_related('author')
127127
filter_backends = (DjangoFilterBackend, SearchFilter)
128-
filter_fields = ('active', 'author__id')
128+
filterset_fields = ('active', 'author__id')

pydis_site/apps/api/viewsets/bot/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ class UserViewSet(ModelViewSet):
237237
queryset = User.objects.all().order_by("id")
238238
pagination_class = UserListPagination
239239
filter_backends = (DjangoFilterBackend,)
240-
filter_fields = ('name', 'discriminator')
240+
filterset_fields = ('name', 'discriminator')
241241

242242
def get_serializer(self, *args, **kwargs) -> ModelSerializer:
243243
"""Set Serializer many attribute to True if request body contains a list."""

pydis_site/apps/content/tests/test_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_get_context_data_breadcrumbs(self):
172172
for item in context["breadcrumb_items"]:
173173
item["path"] = Path(item["path"])
174174

175-
self.assertEquals(
175+
self.assertEqual(
176176
context["breadcrumb_items"],
177177
[
178178
{"name": PARSED_CATEGORY_INFO["title"], "path": Path(".")},

pydis_site/apps/home/tests/test_repodata_helpers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_returns_metadata(self, _: mock.MagicMock):
4242
metadata = self.home_view._get_repo_data()
4343

4444
self.assertIsInstance(metadata[0], RepositoryMetadata)
45-
self.assertEquals(len(metadata), len(self.home_view.repos))
45+
self.assertEqual(len(metadata), len(self.home_view.repos))
4646

4747
def test_returns_cached_metadata(self):
4848
"""Test if the _get_repo_data helper returns cached data when available."""
@@ -82,7 +82,7 @@ def test_returns_api_data(self, _: mock.MagicMock):
8282
repo = self.home_view.repos[0]
8383

8484
self.assertIsInstance(api_data, dict)
85-
self.assertEquals(len(api_data), len(self.home_view.repos))
85+
self.assertEqual(len(api_data), len(self.home_view.repos))
8686
self.assertIn(repo, api_data.keys())
8787
self.assertIn("stargazers_count", api_data[repo])
8888

@@ -126,7 +126,7 @@ def test_falls_back_to_database_on_error_without_entries(self, mock_get: mock.Ma
126126
with self.assertLogs():
127127
metadata = self.home_view._get_repo_data()
128128

129-
self.assertEquals(len(metadata), 0)
129+
self.assertEqual(len(metadata), 0)
130130

131131
def test_cleans_up_stale_metadata(self):
132132
"""Tests that we clean up stale metadata when we start the HomeView."""

0 commit comments

Comments
 (0)