diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:33:08 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:33:08 -0700 |
commit | 38be5bcc7928dd5f9ff19277c2bb12a3972e4c9a (patch) | |
tree | db4dfe18cab09c213043922eee06bbb0e56a0f53 /grc/gui/Preferences.py | |
parent | 8843ffdf4b10c47acf843133af9491ab15ac72d4 (diff) | |
parent | 1c122cbb5cdb1a979fc60e81646a39cbe7b89adf (diff) |
Merge branch 'master' into next
Diffstat (limited to 'grc/gui/Preferences.py')
-rw-r--r-- | grc/gui/Preferences.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py index 5fbdfe927a..d377018eb4 100644 --- a/grc/gui/Preferences.py +++ b/grc/gui/Preferences.py @@ -74,7 +74,7 @@ def entry(key, value=None, default=None): }.get(_type, _config_parser.get) try: result = getter('main', key) - except ConfigParser.Error: + except (AttributeError, ConfigParser.Error): result = _type() if default is None else default return result @@ -106,7 +106,7 @@ def get_file_list(key): try: files = [value for name, value in _config_parser.items(key) if name.startswith('%s_' % key)] - except ConfigParser.Error: + except (AttributeError, ConfigParser.Error): files = [] return files |