summaryrefslogtreecommitdiff
path: root/grc/gui/Preferences.py
diff options
context:
space:
mode:
authorSebastian Koslowski <koslowski@kit.edu>2016-08-09 21:15:56 +0200
committerSebastian Koslowski <koslowski@kit.edu>2016-08-09 21:18:29 +0200
commit8e2886dc6b45b4e3f68d84887f728483fd2d1538 (patch)
treee682bbea9e329c80ebc66233d58a01a1306bddbd /grc/gui/Preferences.py
parentcbe1e43b0f0d1ee0d356b7110700400578855ac6 (diff)
parentfc1a6a88483120921936e415aba4d5d1a9b42d96 (diff)
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'grc/gui/Preferences.py')
-rw-r--r--grc/gui/Preferences.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py
index 8756a7ab23..d917537971 100644
--- a/grc/gui/Preferences.py
+++ b/grc/gui/Preferences.py
@@ -77,7 +77,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
@@ -109,7 +109,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