From 4de81229202ffb79ef442e010fde692eb3de79e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 4 Sep 2018 14:34:14 +0200 Subject: [PATCH] More code simplification --- blender_cloud/project_specific.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/blender_cloud/project_specific.py b/blender_cloud/project_specific.py index 2587b94..f744708 100644 --- a/blender_cloud/project_specific.py +++ b/blender_cloud/project_specific.py @@ -63,15 +63,18 @@ def handle_project_update(_=None, _2=None): log.debug('setting flamenco manager to %s', manager_id) try: prefs.flamenco_manager.manager = manager_id - if 'flamenco_managers_settings' in ps and \ - prefs.flamenco_manager.manager in ps['flamenco_managers_settings']: - mps = ps['flamenco_managers_settings'][prefs.flamenco_manager.manager] - setattr(prefs, 'flamenco_job_file_path', mps['file_path']) - setattr(prefs, 'flamenco_job_output_path', mps['output_path']) - setattr(prefs, 'flamenco_job_output_strip_components', mps['output_strip_components']) except TypeError: log.warning('manager %s for this project could not be found', manager_id) - + else: + try: + mps = ps['flamenco_managers_settings'][prefs.flamenco_manager.manager] + except KeyError: + # No settings for this manager, so nothing to do. + pass + else: + prefs.flamenco_job_file_path = mps['file_path'] + prefs.flamenco_job_output_path = mps['output_path'] + prefs.flamenco_job_output_strip_components = mps['output_strip_components'] finally: project_settings_loading = False