diff options
Diffstat (limited to 'ick_controller.py')
| -rw-r--r-- | ick_controller.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ick_controller.py b/ick_controller.py index 0957ae6..a029145 100644 --- a/ick_controller.py +++ b/ick_controller.py @@ -19,7 +19,6 @@ import os import apifw -import Crypto.PublicKey.RSA import slog import yaml @@ -47,10 +46,10 @@ default_config = { } -def load_config(filename, default_config): - config = yaml.safe_load(open(filename, 'r')) - actual_config = dict(default_config) - actual_config.update(config) +def load_config(filename, defconf): + conf = yaml.safe_load(open(filename, 'r')) + actual_config = dict(defconf) + actual_config.update(conf) return actual_config |