Skip to content

Commit d94552b

Browse files
committed
Remove unneeded assertions
1 parent 3c1cc7a commit d94552b

File tree

41 files changed

+0
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+0
-46
lines changed

src/openforms/analytics_tools/tests/test_analytics_rendering.py

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ def setUpTestData(cls):
2525
form = FormFactory.create()
2626
cls.url = reverse("forms:form-detail", kwargs={"slug": form.slug})
2727
config = AnalyticsToolsConfiguration.get_solo()
28-
assert isinstance(config, AnalyticsToolsConfiguration)
2928
config.analytics_cookie_consent_group, _ = CookieGroup.objects.get_or_create(
3029
varname="analytical"
3130
)

src/openforms/appointments/api/serializers.py

-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ def validate(self, attrs: dict) -> dict:
209209
)
210210

211211
config = AppointmentsConfig.get_solo()
212-
assert isinstance(config, AppointmentsConfig)
213212
plugin = get_plugin()
214213
# normalize to data class instances to call plugin methods
215214
products = [

src/openforms/appointments/api/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ def get_objects(self):
110110

111111
plugin = get_plugin()
112112
config = AppointmentsConfig().get_solo()
113-
assert isinstance(config, AppointmentsConfig)
114113
kwargs = {}
115114
if location_id := config.limit_to_location:
116115
kwargs["location_id"] = location_id

src/openforms/appointments/contrib/jcc/client.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77

88
def get_client() -> Client:
99
config = JccConfig.get_solo()
10-
assert isinstance(config, JccConfig)
1110
assert config.service is not None
1211
return build_client(config.service)

src/openforms/appointments/contrib/qmatic/client.py

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def QmaticClient() -> "Client":
7474
Create a Qmatic client instance from the database configuration.
7575
"""
7676
config = QmaticConfig.get_solo()
77-
assert isinstance(config, QmaticConfig)
7877
if (service := config.service) is None:
7978
raise NoServiceConfigured("No Qmatic service defined, aborting!")
8079
assert isinstance(service, Service)

src/openforms/appointments/contrib/qmatic/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ def get_required_customer_fields(
303303
products: list[Product],
304304
) -> list[Component]:
305305
config = QmaticConfig.get_solo()
306-
assert isinstance(config, QmaticConfig)
307306
components = [
308307
FIELD_TO_FORMIO_COMPONENT[field]
309308
for field in config.required_customer_fields

src/openforms/appointments/tests/test_admin.py

-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ def test_configure_default_location(self):
202202
)
203203

204204
config = AppointmentsConfig.get_solo()
205-
assert isinstance(config, AppointmentsConfig)
206205
config.plugin = "test"
207206
config.save()
208207

src/openforms/appointments/utils.py

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def get_plugin(plugin: str = "") -> BasePlugin:
3131
"""returns plugin selected in AppointmentsConfig"""
3232
if not plugin:
3333
config = AppointmentsConfig.get_solo()
34-
assert isinstance(config, AppointmentsConfig)
3534
if not (plugin := config.plugin):
3635
raise ValueError("No plugin is specified in AppointmentsConfig")
3736
return register[plugin]

src/openforms/authentication/contrib/digid/tests/test_auth_procedure.py

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def setUpTestData(cls):
5353
METADATA = TEST_FILES / "metadata.xml"
5454

5555
config = DigidConfiguration.get_solo()
56-
assert isinstance(config, DigidConfiguration)
5756
config.certificate = cert
5857
config.base_url = "https://test-sp.nl"
5958
config.entity_id = "https://test-sp.nl"

src/openforms/authentication/contrib/digid/tests/test_signicat_integration.py

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ def setUpTestData(cls):
8181
)
8282

8383
config = DigidConfiguration.get_solo()
84-
assert isinstance(config, DigidConfiguration)
8584
config.certificate = cert
8685
# broker insists using https
8786
config.base_url = config.entity_id = "https://localhost:8000"

src/openforms/authentication/contrib/digid_eherkenning_oidc/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ def handle_return(self, request: HttpRequest, form: Form):
129129
def logout(self, request: HttpRequest):
130130
if id_token := request.session.get(OIDC_ID_TOKEN_SESSION_KEY):
131131
config = self.config_class.get_solo()
132-
assert isinstance(config, BaseConfig)
133132
do_op_logout(config, id_token)
134133

135134
keys_to_delete = (

src/openforms/authentication/contrib/eherkenning/tests/test_eherkenning_auth.py

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def setUpTestData(cls):
4545
METADATA = TEST_FILES / "eherkenning-metadata.xml"
4646

4747
config = EherkenningConfiguration.get_solo()
48-
assert isinstance(config, EherkenningConfiguration)
4948
config.certificate = cert
5049
config.base_url = "https://test-sp.nl"
5150
config.entity_id = "urn:etoegang:DV:00000001111111111000:entities:9000"

src/openforms/authentication/contrib/eherkenning/tests/test_eidas_auth.py

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def setUpTestData(cls):
4545
METADATA = TEST_FILES / "eherkenning-metadata.xml"
4646

4747
config = EherkenningConfiguration.get_solo()
48-
assert isinstance(config, EherkenningConfiguration)
4948
config.certificate = cert
5049
config.base_url = "https://test-sp.nl"
5150
config.entity_id = "urn:etoegang:DV:00000001111111111000:entities:9000"

src/openforms/authentication/contrib/eherkenning/tests/test_signicat_integration.py

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ def setUpTestData(cls):
8282
)
8383

8484
config = EherkenningConfiguration.get_solo()
85-
assert isinstance(config, EherkenningConfiguration)
8685
config.certificate = cert
8786
config.idp_service_entity_id = SIGNICAT_BROKER_BASE / "sp/saml"
8887
# broker insists using https

src/openforms/config/api/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class PrivacyPolicyInfoView(APIView):
2121

2222
def get(self, request: Request) -> Response:
2323
conf = GlobalConfiguration.get_solo()
24-
assert isinstance(conf, GlobalConfiguration)
2524
if not conf.ask_privacy_consent:
2625
info = PrivacyPolicyInfo(requires_privacy_consent=False)
2726
else:

src/openforms/config/templatetags/theme.py

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ def get_theme(context: Context) -> Theme:
1919
theme = context.get(THEME_OVERRIDE_CONTEXT_VAR)
2020
if not theme:
2121
config = GlobalConfiguration.get_solo()
22-
assert isinstance(config, GlobalConfiguration)
2322
theme = config.get_default_theme()
2423
# cache it in the context to avoid repeated lookups
2524
context[THEME_OVERRIDE_CONTEXT_VAR] = theme

src/openforms/config/tests/test_global_configuration.py

-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
def _ensure_arrayfields(form: WebTestForm, config: GlobalConfiguration | None = None):
2424
if config is None:
2525
config = GlobalConfiguration.get_solo() # type: ignore
26-
assert isinstance(config, GlobalConfiguration)
2726
# set the values manually, normally this is done through JS (django-jsonform takes
2827
# care of it)
2928
form["email_template_netloc_allowlist"] = json.dumps(
@@ -61,7 +60,6 @@ def _cleanup():
6160
def test_plugin_configuration(self):
6261
# mocking the admin/solo machinery is not straightforward here...
6362
config = GlobalConfiguration.get_solo()
64-
assert isinstance(config, GlobalConfiguration)
6563
config.plugin_configuration = {
6664
"authentication": {
6765
"digid": {
@@ -93,7 +91,6 @@ def test_plugin_configuration(self):
9391

9492
def test_configuration_save_form_email_can_be_added(self):
9593
config = GlobalConfiguration.get_solo()
96-
assert isinstance(config, GlobalConfiguration)
9794
url = reverse("admin:config_globalconfiguration_change", args=(1,))
9895

9996
change_page = self.app.get(url)

src/openforms/config/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
3838

3939
def get_clamav_entry(self):
4040
config = GlobalConfiguration.get_solo()
41-
assert isinstance(config, GlobalConfiguration)
4241
config_url = reverse(
4342
"admin:config_globalconfiguration_change", args=(config.pk,)
4443
)

src/openforms/contrib/brk/client.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class NoServiceConfigured(RuntimeError):
2020

2121
def get_client(submission: Submission | None = None) -> "BRKClient":
2222
config = BRKConfig.get_solo()
23-
assert isinstance(config, BRKConfig)
2423
if not (service := config.service):
2524
raise NoServiceConfigured("No BRK service configured!")
2625
context = (

src/openforms/contrib/haal_centraal/clients/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ def get_brp_client(submission: Submission | None = None, **kwargs: Any) -> BRPCl
2525

2626
config = HaalCentraalConfig.get_solo()
2727
global_config = GlobalConfiguration.get_solo()
28-
assert isinstance(config, HaalCentraalConfig)
29-
assert isinstance(global_config, GlobalConfiguration)
3028
if not (service := config.brp_personen_service):
3129
raise NoServiceConfigured("No BRP service configured!")
3230

src/openforms/contrib/kadaster/clients/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ class NoServiceConfigured(RuntimeError):
1111

1212
def get_locatieserver_client() -> LocatieServerClient:
1313
config = KadasterApiConfig.get_solo()
14-
assert isinstance(config, KadasterApiConfig)
1514
# model field is not nullable because a default is configured
1615
assert (service := config.search_service)
1716
return build_client(service, client_factory=LocatieServerClient)
1817

1918

2019
def get_bag_client() -> BAGClient:
2120
config = KadasterApiConfig.get_solo()
22-
assert isinstance(config, KadasterApiConfig)
2321
if not (service := config.bag_service):
2422
raise NoServiceConfigured("No BAG service configured!")
2523
return build_client(service, client_factory=BAGClient)

src/openforms/contrib/kvk/client.py

-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515

1616
def get_kvk_profile_client() -> "KVKProfileClient":
1717
config = KVKConfig.get_solo()
18-
assert isinstance(config, KVKConfig)
1918
if not (service := config.profile_service):
2019
raise NoServiceConfigured("No KVK basisprofielen service configured!")
2120
return build_client(service, client_factory=KVKProfileClient)
2221

2322

2423
def get_kvk_search_client() -> "KVKSearchClient":
2524
config = KVKConfig.get_solo()
26-
assert isinstance(config, KVKConfig)
2725
if not (service := config.search_service):
2826
raise NoServiceConfigured("No KVK zoeken service configured!")
2927
return build_client(service, client_factory=KVKSearchClient)

src/openforms/emails/confirmation_emails.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
def get_confirmation_email_templates(submission: "Submission") -> tuple[str, str]:
2121
with translation.override(submission.language_code):
2222
config = GlobalConfiguration.get_solo()
23-
assert isinstance(config, GlobalConfiguration)
2423
if not hasattr(submission.form, "confirmation_email_template"):
2524
return config.confirmation_email_subject, config.confirmation_email_content
2625

src/openforms/emails/context.py

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
def get_wrapper_context(html_content="", theme: Theme | None = None):
1010
config = GlobalConfiguration.get_solo()
11-
assert isinstance(config, GlobalConfiguration)
1211
theme = theme or config.get_default_theme()
1312

1413
design_tokens = theme.design_token_values or {}

src/openforms/emails/validators.py

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def __call__(self, value):
3939
from openforms.emails.utils import get_system_netloc_allowlist
4040

4141
config = GlobalConfiguration.get_solo()
42-
assert isinstance(config, GlobalConfiguration)
4342

4443
allowlist = (
4544
get_system_netloc_allowlist() + config.email_template_netloc_allowlist

src/openforms/formio/components/custom.py

-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ class Map(BasePlugin[Component]):
191191
def rewrite_for_request(component, request: Request):
192192
if component.get("useConfigDefaultMapSettings", False):
193193
config = GlobalConfiguration.get_solo()
194-
assert isinstance(config, GlobalConfiguration)
195194
component["defaultZoom"] = config.form_map_default_zoom_level
196195
component.setdefault("initialCenter", {})
197196
component["initialCenter"]["lat"] = config.form_map_default_latitude

src/openforms/formio/components/vanilla.py

-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ def rewrite_for_request(component: FileComponent, request: Request):
374374
# check if we need to apply "filePattern" modifications
375375
if component.get("useConfigFiletypes", False):
376376
config = GlobalConfiguration.get_solo()
377-
assert isinstance(config, GlobalConfiguration)
378377
mimetypes: list[str] = config.form_upload_default_file_types # type: ignore
379378
component["filePattern"] = ",".join(mimetypes)
380379
component["file"].update(

src/openforms/forms/admin/mixins.py

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def render_change_form(
2121
self, request, context, add=False, change=False, form_url="", obj=None
2222
):
2323
config = GlobalConfiguration.get_solo()
24-
assert isinstance(config, GlobalConfiguration)
2524
context.update(
2625
{
2726
"required_default": config.form_fields_required_default,

src/openforms/forms/api/serializers/form.py

-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ def get_resume_link_lifetime(self, obj) -> int:
553553
@extend_schema_field(field=build_array_type(STATEMENT_CHECKBOX_SCHEMA))
554554
def get_submission_statements_configuration(self, obj: Form) -> list[Component]:
555555
config = GlobalConfiguration.get_solo()
556-
assert isinstance(config, GlobalConfiguration)
557556

558557
ask_privacy_consent = (
559558
obj.ask_privacy_consent == StatementCheckboxChoices.required

src/openforms/forms/models/form.py

-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ def get_statement_checkbox_required(
613613

614614
# otherwise, check the global configuration
615615
config = GlobalConfiguration.get_solo()
616-
assert isinstance(config, GlobalConfiguration)
617616
return getattr(config, field_name)
618617

619618
def activate(self):

src/openforms/forms/tests/test_views.py

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def setUpTestData(cls):
6969
super().setUpTestData()
7070

7171
config = GlobalConfiguration.get_solo()
72-
assert isinstance(config, GlobalConfiguration)
7372
config.main_website = "https://example.com"
7473
config.save()
7574

src/openforms/plugins/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def get_label(self):
2626
@property
2727
def is_enabled(self) -> bool:
2828
config = GlobalConfiguration.get_solo()
29-
assert isinstance(config, GlobalConfiguration)
3029
return config.plugin_enabled(self.registry.module, self.identifier)
3130

3231
def check_config(self):

src/openforms/prefill/contrib/haalcentraal_brp/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
def get_attributes_cls():
3535
config = HaalCentraalConfig.get_solo()
36-
assert isinstance(config, HaalCentraalConfig)
3736

3837
match config:
3938
case HaalCentraalConfig(

src/openforms/registrations/api/filters.py

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def get_ztc_client(self) -> CatalogiClient | None:
6969
if zgw_api_group is not None:
7070
return get_catalogi_client(zgw_api_group)
7171
config = ZgwConfig.get_solo()
72-
assert isinstance(config, ZgwConfig)
7372
if group := config.default_zgw_api_group:
7473
return get_catalogi_client(group)
7574
elif registration_backend == "objects_api":

src/openforms/registrations/contrib/objects_api/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def set_defaults(options: RegistrationOptions) -> None:
5656

5757
if options["version"] == 1:
5858
global_config = ObjectsAPIConfig.get_solo()
59-
assert isinstance(global_config, ObjectsAPIConfig)
6059
if not options.get("content_json", "").strip():
6160
options["content_json"] = global_config.content_json
6261
if not options.get("payment_status_update_json", "").strip():

src/openforms/registrations/contrib/stuf_zds/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ def update_payment_status(self, submission: "Submission", options: ZaakOptions):
342342

343343
def check_config(self):
344344
config = StufZDSConfig.get_solo()
345-
assert isinstance(config, StufZDSConfig)
346345

347346
options: ZaakOptions = {
348347
"omschrijving": "MyForm",

src/openforms/registrations/contrib/zgw_apis/options.py

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def validate(self, attrs: dict[str, Any]) -> dict[str, Any]:
108108
# First checking that a ZGWApiGroupConfig is available:
109109
if attrs.get("zgw_api_group") is None:
110110
config = ZgwConfig.get_solo()
111-
assert isinstance(config, ZgwConfig)
112111
if config.default_zgw_api_group is None:
113112
raise serializers.ValidationError(
114113
{

src/openforms/registrations/contrib/zgw_apis/plugin.py

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ def get_zgw_config(options: dict) -> ZGWApiGroupConfig:
147147
zgw = options.get("zgw_api_group")
148148
if zgw is None:
149149
config = ZgwConfig.get_solo()
150-
assert isinstance(config, ZgwConfig)
151150
zgw = config.default_zgw_api_group
152151
return zgw
153152

src/openforms/tests/test_cookie_notice.py

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def setup_test_data(live_server_url: str):
2626
call_command("loaddata", "cookie_consent", stdout=StringIO())
2727

2828
config = AnalyticsToolsConfiguration.get_solo()
29-
assert isinstance(config, AnalyticsToolsConfiguration)
3029

3130
# configure an analytics provider so that the JS snippets are not empty
3231
config.matomo_url = f"{live_server_url}/static"

src/stuf/stuf_bg/client.py

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class NoServiceConfigured(RuntimeError):
2424

2525
def get_client() -> "Client":
2626
config = StufBGConfig.get_solo()
27-
assert isinstance(config, StufBGConfig)
2827
if not (service := config.service):
2928
raise NoServiceConfigured("You must configure a service!")
3029
return StufBGClient(service)

src/stuf/stuf_zds/client.py

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class NoServiceConfigured(RuntimeError):
102102

103103
def get_client(options: ZaakOptions) -> "Client":
104104
config = StufZDSConfig.get_solo()
105-
assert isinstance(config, StufZDSConfig)
106105
if not (service := config.service):
107106
raise NoServiceConfigured("You must configure a service!")
108107
return StufZDSClient(service, options)

0 commit comments

Comments
 (0)