diff options
| author | Lars Wirzenius <liw@liw.fi> | 2017-09-24 17:57:16 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2017-09-24 18:19:35 +0300 |
| commit | ea346f7b8dd7d3aa616e029e5828bd904f6c0c50 (patch) | |
| tree | bc84a08496947f28e42ff7c49fad8efd96cfa764 /ick_controller.py | |
| parent | 5e56ceed83a6ebf785dde74481f63c7d71db6119 (diff) | |
| download | ick2-ea346f7b8dd7d3aa616e029e5828bd904f6c0c50.tar.gz | |
Fix: errors/warnings from pylint
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 |