From 6092f88cf6cd9fd96f4b7222a5fc8227632c5e17 Mon Sep 17 00:00:00 2001 From: Jim Laney Date: Fri, 1 Mar 2024 09:57:49 -0800 Subject: [PATCH 1/2] multiple configuration fixes for gradepage restclient --- project/base_settings/restclients_settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/project/base_settings/restclients_settings.py b/project/base_settings/restclients_settings.py index ec1375b..c010c60 100644 --- a/project/base_settings/restclients_settings.py +++ b/project/base_settings/restclients_settings.py @@ -151,16 +151,16 @@ if os.getenv('GRADEPAGE_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_GRADEPAGE_DAO_CLASS = 'Live' - RESTCLIENTS_GRADEPAG_CONNECT_TIMEOUT = os.getenv( - "GRADEPAG_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) - RESTCLIENTS_GRADEPAGE_DAO_CLASS_TIMEOUT = os.getenv( - "GRADEPAGE_DAO_CLASS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) - RESTCLIENTS_GRADEPAGE_DAO_CLASS_POOL_SIZE = os.getenv( - "GRADEPAGE_DAO_CLASS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + RESTCLIENTS_GRADEPAGE_CONNECT_TIMEOUT = os.getenv( + "GRADEPAGE_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + RESTCLIENTS_GRADEPAGE_TIMEOUT = os.getenv( + "GRADEPAGE_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + RESTCLIENTS_GRADEPAGE_POOL_SIZE = os.getenv( + "GRADEPAGE_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) if os.getenv('GRADEPAGE_ENV') == 'PROD': RESTCLIENTS_GRADEPAGE_HOST = 'https://gradepage.uw.edu' else: - RESTCLIENTS_GRADEPAGE_HOST = 'https://gradepage-test.s.uw.edu' + RESTCLIENTS_GRADEPAGE_HOST = 'https://test.gradepage.uw.edu' if os.getenv('BOOKSTORE_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_BOOK_DAO_CLASS = 'Live' From 1d60676d16aeabab00479abea783ad67771943e1 Mon Sep 17 00:00:00 2001 From: Jim Laney Date: Fri, 1 Mar 2024 10:07:36 -0800 Subject: [PATCH 2/2] avoid mixed quoting styles --- project/base_settings/restclients_settings.py | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/project/base_settings/restclients_settings.py b/project/base_settings/restclients_settings.py index c010c60..b9b15f5 100644 --- a/project/base_settings/restclients_settings.py +++ b/project/base_settings/restclients_settings.py @@ -13,11 +13,11 @@ if os.getenv('GWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_GWS_DAO_CLASS = 'Live' RESTCLIENTS_GWS_CONNECT_TIMEOUT = os.getenv( - "GWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'GWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_GWS_TIMEOUT = os.getenv( - "GWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'GWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_GWS_POOL_SIZE = os.getenv( - "GWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'GWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_GWS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_GWS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('GWS_ENV') == 'PROD': @@ -28,11 +28,11 @@ if os.getenv('SWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_SWS_DAO_CLASS = 'Live' RESTCLIENTS_SWS_CONNECT_TIMEOUT = os.getenv( - "SWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'SWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_SWS_TIMEOUT = os.getenv( - "SWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'SWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_SWS_POOL_SIZE = os.getenv( - "SWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'SWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_SWS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_SWS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('SWS_ENV') == 'PROD': @@ -43,11 +43,11 @@ if os.getenv('PWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_PWS_DAO_CLASS = 'Live' RESTCLIENTS_PWS_CONNECT_TIMEOUT = os.getenv( - "PWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'PWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_PWS_TIMEOUT = os.getenv( - "PWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'PWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_PWS_POOL_SIZE = os.getenv( - "PWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'PWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_PWS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_PWS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('PWS_ENV') == 'PROD': @@ -58,11 +58,11 @@ if os.getenv('KWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_KWS_DAO_CLASS = 'Live' RESTCLIENTS_KWS_CONNECT_TIMEOUT = os.getenv( - "KWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'KWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_KWS_TIMEOUT = os.getenv( - "KWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'KWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_KWS_POOL_SIZE = os.getenv( - "KWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'KWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_KWS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_KWS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('KWS_ENV') == 'PROD': @@ -73,11 +73,11 @@ if os.getenv('HRPWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_HRPWS_DAO_CLASS = 'Live' RESTCLIENTS_HRPWS_CONNECT_TIMEOUT = os.getenv( - "HRPWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'HRPWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_HRPWS_TIMEOUT = os.getenv( - "HRPWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'HRPWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_HRPWS_POOL_SIZE = os.getenv( - "HRPWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'HRPWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_HRPWS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_HRPWS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('HRPWS_ENV') == 'PROD': @@ -88,11 +88,11 @@ if os.getenv('NWS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_NWS_DAO_CLASS = 'Live' RESTCLIENTS_NWS_CONNECT_TIMEOUT = os.getenv( - "NWS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'NWS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_NWS_TIMEOUT = os.getenv( - "NWS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'NWS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_NWS_POOL_SIZE = os.getenv( - "NWS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'NWS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_NWS_AUTH_DAO_CLASS = RESTCLIENTS_NWS_DAO_CLASS RESTCLIENTS_NWS_AUTH_TIMEOUT = RESTCLIENTS_NWS_TIMEOUT RESTCLIENTS_NWS_AUTH_POOL_SIZE = RESTCLIENTS_NWS_POOL_SIZE @@ -107,11 +107,11 @@ if os.getenv('UWNETID_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_UWNETID_DAO_CLASS = 'Live' RESTCLIENTS_UWNETID_CONNECT_TIMEOUT = os.getenv( - "UWNETID_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'UWNETID_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_UWNETID_TIMEOUT = os.getenv( - "UWNETID_TIMEOUT", 55) + 'UWNETID_TIMEOUT', 55) RESTCLIENTS_UWNETID_POOL_SIZE = os.getenv( - "UWNETID_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'UWNETID_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_UWNETID_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_UWNETID_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_UWNETID_HOST = 'https://uwnetid.washington.edu' @@ -121,11 +121,11 @@ if os.getenv('CANVAS_ENV') in ['PROD', 'EVAL', 'BETA']: RESTCLIENTS_CANVAS_DAO_CLASS = 'Live' RESTCLIENTS_CANVAS_CONNECT_TIMEOUT = os.getenv( - "CANVAS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'CANVAS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_CANVAS_TIMEOUT = os.getenv( - "CANVAS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'CANVAS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_CANVAS_POOL_SIZE = os.getenv( - "CANVAS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'CANVAS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_CANVAS_OAUTH_BEARER = os.getenv('CANVAS_OAUTH_BEARER', '') RESTCLIENTS_CANVAS_ACCOUNT_ID = os.getenv('CANVAS_ACCOUNT_ID') if os.getenv('CANVAS_ENV') == 'PROD': @@ -138,11 +138,11 @@ if os.getenv('CODA_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_CODA_DAO_CLASS = 'Live' RESTCLIENTS_CODA_CONNECT_TIMEOUT = os.getenv( - "CODA_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'CODA_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_CODA_TIMEOUT = os.getenv( - "CODA_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'CODA_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_CODA_POOL_SIZE = os.getenv( - "CODA_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'CODA_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_CODA_AUTH_TOKEN = os.getenv('CODA_AUTH_TOKEN', '') if os.getenv('CODA_ENV') == 'PROD': RESTCLIENTS_CODA_HOST = 'https://coda.uw.edu' @@ -152,11 +152,11 @@ if os.getenv('GRADEPAGE_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_GRADEPAGE_DAO_CLASS = 'Live' RESTCLIENTS_GRADEPAGE_CONNECT_TIMEOUT = os.getenv( - "GRADEPAGE_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'GRADEPAGE_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_GRADEPAGE_TIMEOUT = os.getenv( - "GRADEPAGE_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'GRADEPAGE_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_GRADEPAGE_POOL_SIZE = os.getenv( - "GRADEPAGE_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'GRADEPAGE_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) if os.getenv('GRADEPAGE_ENV') == 'PROD': RESTCLIENTS_GRADEPAGE_HOST = 'https://gradepage.uw.edu' else: @@ -165,17 +165,17 @@ if os.getenv('BOOKSTORE_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_BOOK_DAO_CLASS = 'Live' RESTCLIENTS_BOOK_CONNECT_TIMEOUT = os.getenv( - "BOOK_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'BOOK_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_BOOK_TIMEOUT = os.getenv( - "BOOK_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'BOOK_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_BOOK_POOL_SIZE = os.getenv( - "BOOK_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'BOOK_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_BOOK_HOST = 'https://www7.bookstore.washington.edu' if os.getenv('GRAD_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_GRAD_DAO_CLASS = 'Live' RESTCLIENTS_GRAD_CONNECT_TIMEOUT = os.getenv( - "GRAD_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'GRAD_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_GRAD_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_GRAD_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('GRAD_ENV') == 'PROD': @@ -186,11 +186,11 @@ if os.getenv('MYPLAN_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_MYPLAN_DAO_CLASS = 'Live' RESTCLIENTS_MYPLAN_CONNECT_TIMEOUT = os.getenv( - "MYPLAN_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'MYPLAN_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_MYPLAN_TIMEOUT = os.getenv( - "MYPLAN_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'MYPLAN_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_MYPLAN_POOL_SIZE = os.getenv( - "MYPLAN_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'MYPLAN_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_MYPLAN_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_MYPLAN_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('MYPLAN_ENV') == 'PROD': @@ -201,11 +201,11 @@ if os.getenv('LIBCURRICS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_LIBCURRICS_DAO_CLASS = 'Live' RESTCLIENTS_LIBCURRICS_CONNECT_TIMEOUT = os.getenv( - "LIBCURRICS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'LIBCURRICS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_LIBCURRICS_TIMEOUT = os.getenv( - "LIBCURRICS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'LIBCURRICS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_LIBCURRICS_POOL_SIZE = os.getenv( - "LIBCURRICS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'LIBCURRICS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_LIBCURRICS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_LIBCURRICS_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_LIBCURRICS_HOST = 'https://currics.lib.washington.edu' @@ -213,11 +213,11 @@ if os.getenv('LIBRARIES_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_LIBRARIES_DAO_CLASS = 'Live' RESTCLIENTS_LIBRARIES_CONNECT_TIMEOUT = os.getenv( - "LIBRARIES_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'LIBRARIES_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_LIBRARIES_TIMEOUT = os.getenv( - "LIBRARIES_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'LIBRARIES_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_LIBRARIES_POOL_SIZE = os.getenv( - "LIBRARIES_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'LIBRARIES_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_LIBRARIES_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_LIBRARIES_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_LIBRARIES_HOST = 'https://mylibinfo.lib.washington.edu' @@ -225,11 +225,11 @@ if os.getenv('CALENDAR_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_CALENDAR_DAO_CLASS = 'Live' RESTCLIENTS_CALENDAR_CONNECT_TIMEOUT = os.getenv( - "CALENDAR_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'CALENDAR_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_CALENDAR_TIMEOUT = os.getenv( - "CALENDAR_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'CALENDAR_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_CALENDAR_POOL_SIZE = os.getenv( - "CALENDAR_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'CALENDAR_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_CALENDAR_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_CALENDAR_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_CALENDAR_HOST = 'https://www.trumba.com' @@ -237,11 +237,11 @@ if os.getenv('SDBMYUW_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_SDBMYUW_DAO_CLASS = 'Live' RESTCLIENTS_SDBMYUW_CONNECT_TIMEOUT = os.getenv( - "SDBMYUW_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'SDBMYUW_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_SDBMYUW_TIMEOUT = os.getenv( - "SDBMYUW_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'SDBMYUW_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_SDBMYUW_POOL_SIZE = os.getenv( - "SDBMYUW_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'SDBMYUW_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) if os.getenv('SDBMYUW_ENV') == 'PROD': RESTCLIENTS_SDBMYUW_HOST = 'https://sdb.admin.uw.edu' else: @@ -250,11 +250,11 @@ if os.getenv('HFS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_HFS_DAO_CLASS = 'Live' RESTCLIENTS_HFS_CONNECT_TIMEOUT = os.getenv( - "HFS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'HFS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_HFS_TIMEOUT = os.getenv( - "HFS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'HFS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_HFS_POOL_SIZE = os.getenv( - "HFS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'HFS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_HFS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_HFS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('HFS_ENV') == 'PROD': @@ -265,11 +265,11 @@ if os.getenv('UWIDP_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_UWIDP_DAO_CLASS = 'Live' RESTCLIENTS_UWID_CONNECT_TIMEOUT = os.getenv( - "UWID_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'UWID_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_UWIDP_TIMEOUT = os.getenv( - "UWIDP_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'UWIDP_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_UWIDP_POOL_SIZE = os.getenv( - "UWIDP_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'UWIDP_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) if os.getenv('UWIDP_ENV') == 'PROD': RESTCLIENTS_UWIDP_HOST = 'https://idp.u.washington.edu' else: @@ -278,11 +278,11 @@ if os.getenv('ADSEL_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_ADSEL_DAO_CLASS = 'Live' RESTCLIENTS_ADSEL_CONNECT_TIMEOUT = os.getenv( - "ADSEL_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'ADSEL_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_ADSEL_TIMEOUT = os.getenv( - "ADSEL_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'ADSEL_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_ADSEL_POOL_SIZE = os.getenv( - "ADSEL_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'ADSEL_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_ADSEL_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_ADSEL_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('ADSEL_ENV') == 'PROD': @@ -293,11 +293,11 @@ if os.getenv('UPASS_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_UPASS_DAO_CLASS = 'Live' RESTCLIENTS_UPASS_CONNECT_TIMEOUT = os.getenv( - "UPASS_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'UPASS_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_UPASS_TIMEOUT = os.getenv( - "UPASS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'UPASS_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_UPASS_POOL_SIZE = os.getenv( - "UPASS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'UPASS_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_UPASS_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_UPASS_KEY_FILE = APPLICATION_KEY_PATH if os.getenv('UPASS_ENV') == 'PROD': @@ -308,11 +308,11 @@ if os.getenv('IASYSTEM_UW_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_IASYSTEM_UW_DAO_CLASS = 'Live' RESTCLIENTS_IASYSTEM_UW_CONNECT_TIMEOUT = os.getenv( - "IASYSTEM_UW_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'IASYSTEM_UW_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_IASYSTEM_UW_TIMEOUT = os.getenv( - "IASYSTEM_UW_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'IASYSTEM_UW_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_IASYSTEM_UW_POOL_SIZE = os.getenv( - "IASYSTEM_UW_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'IASYSTEM_UW_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_IASYSTEM_UW_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_IASYSTEM_UW_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_IASYSTEM_UW_HOST = 'https://uw.iasystem.org' @@ -320,12 +320,12 @@ if os.getenv('IASYSTEM_UWB_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_IASYSTEM_UWB_DAO_CLASS = 'Live' RESTCLIENTS_IASYSTEM_UWB_CONNECT_TIMEOUT = os.getenv( - "IASYSTEM_UWB_CONNECT_TIMEOUT", + 'IASYSTEM_UWB_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWB_TIMEOUT = os.getenv( - "IASYSTEM_UWB_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'IASYSTEM_UWB_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWB_POOL_SIZE = os.getenv( - "IASYSTEM_UWB_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'IASYSTEM_UWB_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_IASYSTEM_UWB_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_IASYSTEM_UWB_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_IASYSTEM_UWB_HOST = 'https://uwb.iasystem.org' @@ -333,12 +333,12 @@ if os.getenv('IASYSTEM_UWT_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_IASYSTEM_UWT_DAO_CLASS = 'Live' RESTCLIENTS_IASYSTEM_UWT_CONNECT_TIMEOUT = os.getenv( - "IASYSTEM_UWT_CONNECT_TIMEOUT", + 'IASYSTEM_UWT_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWT_TIMEOUT = os.getenv( - "IASYSTEM_UWT_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'IASYSTEM_UWT_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWT_POOL_SIZE = os.getenv( - "IASYSTEM_UWT_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'IASYSTEM_UWT_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_IASYSTEM_UWT_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_IASYSTEM_UWT_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_IASYSTEM_UWT_HOST = 'https://uwt.iasystem.org' @@ -346,12 +346,12 @@ if os.getenv('IASYSTEM_UWEO_AP_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_IASYSTEM_UWEO_AP_DAO_CLASS = 'Live' RESTCLIENTS_IASYSTEM_UWEO_AP_CONNECT_TIMEOUT = os.getenv( - "IASYSTEM_UWEO_AP_CONNECT_TIMEOUT", + 'IASYSTEM_UWEO_AP_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_UWEO_AP_TIMEOUT = os.getenv( - "UWEO_AP_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'UWEO_AP_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_UWEO_AP_POOL_SIZE = os.getenv( - "UWEO_AP_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'UWEO_AP_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_IASYSTEM_UWEO_AP_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_IASYSTEM_UWEO_AP_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_IASYSTEM_UWEO_AP_HOST = 'https://uweo-ap.iasystem.org' @@ -359,23 +359,23 @@ if os.getenv('IASYSTEM_UWEO_IELP_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_IASYSTEM_UWEO_IELP_DAO_CLASS = 'Live' RESTCLIENTS_IASYSTEM_UWEO_IELP_CONNECT_TIMEOUT = os.getenv( - "IASYSTEM_UWEO_IELP_CONNECT_TIMEOUT", + 'IASYSTEM_UWEO_IELP_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWEO_IELP_TIMEOUT = os.getenv( - "IASYSTEM_UWEO_IELP_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'IASYSTEM_UWEO_IELP_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_IASYSTEM_UWEO_IELP_POOL_SIZE = os.getenv( - "IASYSTEM_UWEO_IELP_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'IASYSTEM_UWEO_IELP_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_IASYSTEM_UWEO_IELP_CERT_FILE = APPLICATION_CERT_PATH RESTCLIENTS_IASYSTEM_UWEO_IELP_KEY_FILE = APPLICATION_KEY_PATH RESTCLIENTS_IASYSTEM_UWEO_IELP_HOST = 'https://uweo-ielp.iasystem.org' if os.getenv('ASTRA_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_ASTRA_CONNECT_TIMEOUT = os.getenv( - "ASTRA_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'ASTRA_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_ASTRA_TIMEOUT = os.getenv( - "ASTRA_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'ASTRA_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_ASTRA_POOL_SIZE = os.getenv( - "ASTRA_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'ASTRA_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) ASTRA_CERT = APPLICATION_CERT_PATH ASTRA_KEY = APPLICATION_KEY_PATH ASTRA_APPLICATION = os.getenv('ASTRA_APPLICATION', '') @@ -388,11 +388,11 @@ if os.getenv('R25_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_R25_DAO_CLASS = 'Live' RESTCLIENTS_R25_CONNECT_TIMEOUT = os.getenv( - "R25_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'R25_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_R25_TIMEOUT = os.getenv( - "R25_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'R25_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_R25_POOL_SIZE = os.getenv( - "R25_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'R25_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_R25_INSTANCE = 'washington' RESTCLIENTS_R25_SSL_VERSION = 'TLSv1_2' RESTCLIENTS_R25_BASIC_AUTH = os.getenv('R25_BASIC_AUTH', '') @@ -401,11 +401,11 @@ if os.getenv('MAILMAN_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_MAILMAN_DAO_CLASS = 'Live' RESTCLIENTS_MAILMAN_CONNECT_TIMEOUT = os.getenv( - "MAILMAN_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'MAILMAN_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_MAILMAN_TIMEOUT = os.getenv( - "MAILMAN_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT) + 'MAILMAN_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_MAILMAN_POOL_SIZE = os.getenv( - "MAILMAN_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE) + 'MAILMAN_POOL_SIZE', RESTCLIENTS_DEFAULT_POOL_SIZE) RESTCLIENTS_MAILMAN_HOST = 'mailman1.u.washington.edu' RESTCLIENTS_MAILMAN_KEY = os.getenv('MAILMAN_AUTH_KEY', '') MAILMAN_COURSEREQUEST_RECIPIENT = os.getenv( @@ -414,7 +414,7 @@ if os.getenv('TRUMBA_SEA_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_TRUMBA_SEA_DAO_CLASS = 'Live' RESTCLIENTS_TRUMBA_SEA_CONNECT_TIMEOUT = os.getenv( - "TRUMBA_SEA_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'TRUMBA_SEA_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_TRUMBA_SEA_TIMEOUT = os.getenv( 'TRUMBA_SEA_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_TRUMBA_SEA_POOL_SIZE = os.getenv( @@ -428,7 +428,7 @@ if os.getenv('TRUMBA_BOT_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_TRUMBA_BOT_DAO_CLASS = 'Live' RESTCLIENTS_TRUMBA_BOT_CONNECT_TIMEOUT = os.getenv( - "TRUMBA_BOT_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'TRUMBA_BOT_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_TRUMBA_BOT_TIMEOUT = os.getenv( 'TRUMBA_BOT_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_TRUMBA_BOT_POOL_SIZE = os.getenv( @@ -442,7 +442,7 @@ if os.getenv('TRUMBA_TAC_ENV') in RESTCLIENTS_DEFAULT_ENVS: RESTCLIENTS_TRUMBA_TAC_DAO_CLASS = 'Live' RESTCLIENTS_TRUMBA_TAC_CONNECT_TIMEOUT = os.getenv( - "TRUMBA_TAC_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) + 'TRUMBA_TAC_CONNECT_TIMEOUT', RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT) RESTCLIENTS_TRUMBA_TAC_TIMEOUT = os.getenv( 'TRUMBA_TAC_TIMEOUT', RESTCLIENTS_DEFAULT_TIMEOUT) RESTCLIENTS_TRUMBA_TAC_POOL_SIZE = os.getenv(