Philipp Hörist pushed to branch master at gajim / gajim

Commits: 55c7ed44 by lovetox at 2020-08-28T15:44:53+02:00 Settings: Restore default value if None is passed as value

Fixes #10247

- - - - -

1 changed file:

- gajim/common/settings.py

Changes:

===================================== gajim/common/settings.py ===================================== @@ -383,6 +383,13 @@ class _Settings: if setting not in APP_SETTINGS: raise ValueError(f'Invalid app setting: {setting}')

+ if value is None: + try: + del self._settings['app'][setting] + except KeyError: + pass + return + default = APP_SETTINGS[setting] if not isinstance(value, type(default)): raise TypeError(f'Invalid type for {setting}: ' @@ -484,6 +491,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['account']: raise ValueError(f'Invalid account setting: {setting}')

+ if value is None: + try: + del self._account_settings[account]['account'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['account'][setting] if not isinstance(value, type(default)): raise TypeError(f'Invalid type for {setting}: ' @@ -529,6 +543,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['group_chat']: raise ValueError(f'Invalid group chat setting: {setting}')

+ if value is None: + try: + del self._account_settings[account]['group_chat'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['group_chat'][setting] if default is HAS_APP_DEFAULT: if context is None: @@ -579,6 +600,13 @@ class _Settings: if setting not in ACCOUNT_SETTINGS['contact']: raise ValueError(f'Invalid contact setting: {setting}')

+ if value is None: + try: + del self._account_settings[account]['contact'][setting] + except KeyError: + pass + return + default = ACCOUNT_SETTINGS['contact'][setting] if default is HAS_APP_DEFAULT: default = APP_SETTINGS[f'{setting}_default']

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/55c7ed44fc7bb70e27ee07a586585e165...