From e211fb7f609ba72df7be674ae4b4c9e59ffb2f53 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 29 Jan 2019 11:18:08 +0000 Subject: [PATCH] Remove duplicative calls to init_app Easier to read without the repetitive boilerplate. --- app/__init__.py | 61 ++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 5b8cae5bc..0ace264af 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -107,35 +107,40 @@ def create_app(application): asset_fingerprinter._asset_root = application.config['ASSET_PATH'] init_app(application) - antivirus_client.init_app(application) - statsd_client.init_app(application) - zendesk_client.init_app(application) + + for client in ( + antivirus_client, + statsd_client, + zendesk_client, + csrf, + request_helper, + service_api_client, + user_api_client, + api_key_api_client, + job_api_client, + notification_api_client, + status_api_client, + invite_api_client, + org_invite_api_client, + template_statistics_client, + events_api_client, + provider_client, + email_branding_client, + letter_branding_client, + organisations_client, + letter_jobs_client, + inbound_number_client, + billing_api_client, + complaint_api_client, + platform_stats_api_client, + template_folder_api_client, + login_manager, + proxy_fix, + ): + client.init_app(application) + logging.init_app(application, statsd_client) - csrf.init_app(application) - request_helper.init_app(application) - service_api_client.init_app(application) - user_api_client.init_app(application) - api_key_api_client.init_app(application) - job_api_client.init_app(application) - notification_api_client.init_app(application) - status_api_client.init_app(application) - invite_api_client.init_app(application) - org_invite_api_client.init_app(application) - template_statistics_client.init_app(application) - events_api_client.init_app(application) - provider_client.init_app(application) - email_branding_client.init_app(application) - letter_branding_client.init_app(application) - organisations_client.init_app(application) - letter_jobs_client.init_app(application) - inbound_number_client.init_app(application) - billing_api_client.init_app(application) - complaint_api_client.init_app(application) - platform_stats_api_client.init_app(application) - template_folder_api_client.init_app(application) - - login_manager.init_app(application) login_manager.login_view = 'main.sign_in' login_manager.login_message_category = 'default' login_manager.session_protection = None @@ -147,8 +152,6 @@ def create_app(application): from .status import status as status_blueprint application.register_blueprint(status_blueprint) - proxy_fix.init_app(application) - add_template_filters(application) register_errorhandlers(application)