Merge pull request #1159 from maykinmedia/fix/pyupgrade

Applied pyupgrade to project

src/open_inwoner/accounts/admin.py

@@ -29,11 +29,11 @@ def get_fields(self, request, obj=None):
         return fields
 
     def display_file_url(self, obj):
-        view_name = "%(app_label)s_%(model_name)s_%(field)s" % {
-            "app_label": self.opts.app_label,
-            "model_name": self.opts.model_name,
-            "field": "file",
-        }
+        view_name = "{app_label}_{model_name}_{field}".format(
+            app_label=self.opts.app_label,
+            model_name=self.opts.model_name,
+            field="file",
+        )
         return format_html(
             _("<a href='{url}'>{text}</a>"),
             url=reverse(f"admin:{view_name}", kwargs={"pk": obj.pk}),

src/open_inwoner/accounts/gateways.py

@@ -16,7 +16,7 @@ class GatewayError(Exception):
     """
 
 
-class Gateway(object):
+class Gateway:
     def get_message(self, token):
         msg = getattr(settings, "ACCOUNTS_SMS_MESSAGE", "Your token is: {token}")
         return msg.format(token=token)

src/open_inwoner/accounts/models.py

@@ -803,7 +803,7 @@ def get_full_name(self):
         """
         Returns the first_name plus the last_name of the invitee, with a space in between.
         """
-        full_name = "%s %s" % (self.invitee_first_name, self.invitee_last_name)
+        full_name = "{} {}".format(self.invitee_first_name, self.invitee_last_name)
         return full_name.strip()
 
     def save(self, **kwargs):

src/open_inwoner/accounts/tests/test_action_views.py

@@ -147,7 +147,7 @@ def test_action_edit_deleted_action(self):
 
     def test_action_delete_login_required(self):
         response = self.client.post(self.delete_url)
-        self.assertEquals(response.status_code, 403)
+        self.assertEqual(response.status_code, 403)
 
     def test_action_delete_http_get_is_not_allowed(self):
         self.client.force_login(self.user)

src/open_inwoner/accounts/tests/test_file_upload.py

@@ -26,15 +26,15 @@ def test_valid_type_of_file_is_uploaded(self):
         self.form["file"] = Upload("readme.xlsx", b"data", "application/vnd.ms-excel")
         self.form["name"] = "Action name"
         upload_response = self.form.submit()
-        self.assertEquals(Action.objects.first().file.name, "readme.xlsx")
+        self.assertEqual(Action.objects.first().file.name, "readme.xlsx")
         self.assertRedirects(upload_response, reverse("profile:action_list"))
 
     @temp_private_root()
     def test_invalid_type_of_file_is_not_uploaded(self):
         self.form["file"] = Upload("readme.svg", b"data", "image/svg+xml")
         self.form["name"] = "readme"
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -49,7 +49,7 @@ def test_files_bigger_than_max_size_are_not_uploaded(self):
         self.form["file"] = Upload("readme.png", b"data", "image/png")
         self.form["name"] = "readme"
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -64,7 +64,7 @@ def test_files_smaller_than_min_size_are_not_uploaded(self):
         self.form["file"] = Upload("readme.png", b"data", "image/png")
         self.form["name"] = "readme"
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -78,7 +78,7 @@ def test_files_with_no_content_are_not_uploaded(self):
         self.form["file"] = Upload("readme.png", b"", "image/png")
         self.form["name"] = "readme"
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"], [_("Het verstuurde bestand is leeg.")]
         )
 
@@ -98,7 +98,7 @@ def test_valid_type_of_file_is_uploaded(self):
         self.form["content"] = "The message content"
         self.form["receiver"] = str(self.contact.uuid)
         upload_response = self.form.submit()
-        self.assertEquals(Message.objects.first().file.name, "readme.xlsx")
+        self.assertEqual(Message.objects.first().file.name, "readme.xlsx")
         self.assertRedirects(
             upload_response,
             reverse("inbox:index", kwargs={"uuid": self.contact.uuid})
@@ -112,7 +112,7 @@ def test_invalid_type_of_file_is_not_uploaded(self):
         self.form["content"] = "The message content"
         self.form["receiver"] = str(self.contact.uuid)
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -128,7 +128,7 @@ def test_files_bigger_than_max_size_are_not_uploaded(self):
         self.form["content"] = "The message content"
         self.form["receiver"] = str(self.contact.uuid)
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -144,7 +144,7 @@ def test_files_smaller_than_min_size_are_not_uploaded(self):
         self.form["content"] = "The message content"
         self.form["receiver"] = str(self.contact.uuid)
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"],
             [
                 _(
@@ -159,6 +159,6 @@ def test_files_with_no_content_are_not_uploaded(self):
         self.form["content"] = "The message content"
         self.form["receiver"] = str(self.contact.uuid)
         upload_response = self.form.submit()
-        self.assertEquals(
+        self.assertEqual(
             upload_response.context["errors"], [_("Het verstuurde bestand is leeg.")]
         )

src/open_inwoner/accounts/tests/test_profile_views.py

@@ -148,7 +148,7 @@ def test_user_information_profile_page(self):
     def test_get_empty_profile_page(self):
         response = self.app.get(self.url, user=self.user)
 
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         self.assertContains(response, _("U heeft geen interesses gekozen."))
         self.assertContains(response, _("U heeft nog geen contacten"))
         self.assertContains(response, "0 acties staan open")
@@ -163,7 +163,7 @@ def test_get_filled_profile_page(self):
         QuestionnaireStepFactory(published=True)
 
         response = self.app.get(self.url, user=self.user)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         self.assertContains(response, category.name)
         self.assertContains(
             response,
@@ -305,12 +305,12 @@ def test_login_required(self):
 
     def test_save_form(self):
         response = self.app.get(self.url, user=self.user)
-        self.assertEquals(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         form = response.forms["profile-edit"]
         base_response = form.submit()
-        self.assertEquals(base_response.url, self.return_url)
+        self.assertEqual(base_response.url, self.return_url)
         followed_response = base_response.follow()
-        self.assertEquals(followed_response.status_code, 200)
+        self.assertEqual(followed_response.status_code, 200)
 
     def test_save_empty_form_fails(self):
         response = self.app.get(self.url, user=self.user, status=200)
@@ -341,18 +341,18 @@ def test_save_filled_form(self):
         form["postcode"] = "1013 RM"
         form["city"] = "Amsterdam"
         base_response = form.submit()
-        self.assertEquals(base_response.url, self.return_url)
+        self.assertEqual(base_response.url, self.return_url)
         followed_response = base_response.follow()
-        self.assertEquals(followed_response.status_code, 200)
+        self.assertEqual(followed_response.status_code, 200)
         self.user.refresh_from_db()
-        self.assertEquals(self.user.first_name, "First name")
-        self.assertEquals(self.user.last_name, "Last name")
-        self.assertEquals(self.user.display_name, "a nickname")
-        self.assertEquals(self.user.email, "[email protected]")
-        self.assertEquals(self.user.street, "Keizersgracht")
-        self.assertEquals(self.user.housenumber, "17 d")
-        self.assertEquals(self.user.postcode, "1013 RM")
-        self.assertEquals(self.user.city, "Amsterdam")
+        self.assertEqual(self.user.first_name, "First name")
+        self.assertEqual(self.user.last_name, "Last name")
+        self.assertEqual(self.user.display_name, "a nickname")
+        self.assertEqual(self.user.email, "[email protected]")
+        self.assertEqual(self.user.street, "Keizersgracht")
+        self.assertEqual(self.user.housenumber, "17 d")
+        self.assertEqual(self.user.postcode, "1013 RM")
+        self.assertEqual(self.user.city, "Amsterdam")
 
     def test_name_validation(self):
         invalid_characters = '<>#/"\\,.:;'

src/open_inwoner/accounts/views/contactmoments.py

@@ -292,7 +292,7 @@ def get(self, request, *args, **kwargs):
 
         contactmoment_uuid = kwargs["uuid"]
         kcm = next(
-            (kcm for kcm in kcms if str(kcm.contactmoment.uuid) == contactmoment_uuid)
+            kcm for kcm in kcms if str(kcm.contactmoment.uuid) == contactmoment_uuid
         )
 
         if not kcm:

src/open_inwoner/accounts/views/login.py

@@ -83,7 +83,7 @@ def form_valid(self, form):
         else:
             self.log_user_action(
                 user,
-                "SMS bericht met code is verzonden aan {0}".format(user.phonenumber),
+                "SMS bericht met code is verzonden aan {}".format(user.phonenumber),
             )
 
             messages.debug(self.request, gateway.get_message(token))
@@ -255,7 +255,7 @@ def post(self, request):
         else:
             self.log_user_action(
                 user,
-                "SMS bericht met code is verzonden aan {0}".format(user.phonenumber),
+                "SMS bericht met code is verzonden aan {}".format(user.phonenumber),
             )
 
             messages.debug(self.request, gateway.get_message(token))
@@ -333,7 +333,7 @@ def render_next_step(self, form, **kwargs):
 
                 self.log_user_action(
                     self.user_cache,
-                    "SMS bericht met code is verzonden aan {0}".format(phonenumber),
+                    "SMS bericht met code is verzonden aan {}".format(phonenumber),
                 )
 
         return super().render_next_step(form, **kwargs)
@@ -345,7 +345,7 @@ def done(self, form_list, **kwargs):
         self.request.user = self.user_cache
         self.log_change(
             self.user_cache,
-            "Telefoonnummer gewijzigd: {0}".format(phonenumber),
+            "Telefoonnummer gewijzigd: {}".format(phonenumber),
         )
 
         self.user_cache.save()

src/open_inwoner/api/tests/test_views.py

@@ -27,7 +27,7 @@ def test_list_categories_endpoint_returns_both_parent_and_children_categories(se
         response = self.client.get(reverse("api:categories-list"), format="json")
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEquals(
+        self.assertEqual(
             sorted(response.json(), key=lambda k: k["slug"]),
             sorted(
                 [
@@ -87,7 +87,7 @@ def test_category_detail_endpoint_returns_both_parent_and_children_categories(se
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEquals(
+        self.assertEqual(
             response.json(),
             {
                 "name": self.child_category_1.name,

src/open_inwoner/apimock/views.py

@@ -63,7 +63,7 @@ def get(self, request, *args, **kwargs):
         # make dynamic from url conf?
         prefix = request.build_absolute_uri(f"/apimock/{set_name}/")
 
-        with open(file_path, "r") as f:
+        with open(file_path) as f:
             data = inject_filter_parameter_values(request, json.load(f))
             process_urls(data, prefix, self.url_replacers)
             return JsonResponse(data, safe=False)

src/open_inwoner/ckeditor5/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib
 
 from filer.models import Folder, Image

src/open_inwoner/cms/cases/tests/test_htmx.py

@@ -250,7 +250,7 @@ def setUp(self) -> None:
             zaak=self.zaak["url"],
             registratiedatum="2022-01-12",
         )
-        self.uploaded_zaak_informatie_object_content = "test56789".encode("utf8")
+        self.uploaded_zaak_informatie_object_content = b"test56789"
         self.uploaded_informatie_object = generate_oas_component_cached(
             "drc",
             "schemas/EnkelvoudigInformatieObject",
@@ -601,12 +601,12 @@ def mock_upload(request, context):
                 {
                     "name": "document_1.txt",
                     "mimeType": "text/plain",
-                    "buffer": "test12345".encode("utf8"),
+                    "buffer": b"test12345",
                 },
                 {
                     "name": "document_two.pdf",
                     "mimeType": "application/pdf",
-                    "buffer": "test67890".encode("utf8"),
+                    "buffer": b"test67890",
                 },
             ],
         )

src/open_inwoner/cms/products/tests/test_plugin_questionnaire.py

@@ -74,7 +74,7 @@ def test_home_page_contains_highlighted_root_nodes(self):
         html, context = cms_tools.render_plugin(QuestionnairePlugin)
         html, context = cms_tools.render_plugin(QuestionnairePlugin)
 
-        self.assertEquals(context.get("questionnaire_roots").count(), 2)
+        self.assertEqual(context.get("questionnaire_roots").count(), 2)
         self.assertIn(self.root_nodes[0].get_absolute_url(), html)
         self.assertIn(self.root_nodes[1].get_absolute_url(), html)
 

src/open_inwoner/components/templatetags/messages_tags.py

@@ -42,7 +42,7 @@ def get_dates(message_list: MessageQuerySet) -> list[datetime.date]:
         """
         Returns a list of dates to render message(s) for.
         """
-        dates = sorted(set(m.created_on.date() for m in message_list))
+        dates = sorted({m.created_on.date() for m in message_list})
         return dates
 
     def get_date_text(date) -> str | datetime.date:

src/open_inwoner/conf/parts/maileditor.py

@@ -6,7 +6,7 @@
 
 def _readfile(name):
     p = os.path.join(os.path.dirname(__file__), name)
-    with open(p, "r") as f:
+    with open(p) as f:
         return f.read()
 
 

src/open_inwoner/configurations/tests/test_extra_css.py

@@ -31,7 +31,7 @@ def test_extra_css_is_cleaned_on_save(self):
         self.config.extra_css = "body {color: red; unknown: bar; }"
         self.config.save()
 
-        self.assertEquals("body {color: red; }", self.config.extra_css)
+        self.assertEqual("body {color: red; }", self.config.extra_css)
 
     def test_extra_css_rendered_in_homepage(self):
         cms_tools.create_homepage()
@@ -45,7 +45,7 @@ def test_extra_css_rendered_in_homepage(self):
 
         expected = "body {color: red;}"
         actual = response.pyquery("#extra-css")[0].text.strip()
-        self.assertEquals(expected, actual)
+        self.assertEqual(expected, actual)
 
     def test_extra_css_rendered_in_homepage_is_escaped(self):
         cms_tools.create_homepage()
@@ -58,12 +58,12 @@ def test_extra_css_rendered_in_homepage_is_escaped(self):
         response = self.app.get(reverse("pages-root"))
         extra_css = response.context.get("extra_css")
         # not escaped in context
-        self.assertEquals(extra_css, self.config.extra_css)
+        self.assertEqual(extra_css, self.config.extra_css)
 
         style = response.pyquery("#extra-css")
         self.assertEqual(1, len(style))
         actual = style[0].text.strip()
         expected = escape(css)
 
         # escaped
-        self.assertEquals(expected, actual)
+        self.assertEqual(expected, actual)