From a9ec77cce0b5157c9a5b695ba875170851075235 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Wed, 2 Dec 2015 22:39:40 +0000 Subject: [PATCH] PEP8 --- project/config/cli.py | 2 +- project/utils.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/project/config/cli.py b/project/config/cli.py index ed27fa8..d37a126 100644 --- a/project/config/cli.py +++ b/project/config/cli.py @@ -1,8 +1,8 @@ import click from project.utils import get_config + @click.command('config') @click.argument('key') def cli(key): print(get_config(key)) - pass diff --git a/project/utils.py b/project/utils.py index 4aa3dac..0f59e68 100644 --- a/project/utils.py +++ b/project/utils.py @@ -6,9 +6,11 @@ try: except ImportError: from yaml import Loader + BASE_DIR = os.path.dirname(os.path.abspath(__file__)) USER_CONFIG_DIR = "~/.dfa.yml" + def get_config_data(filename): try: config_file = open(filename) @@ -17,10 +19,11 @@ def get_config_data(filename): return [] -DEFAULT_CONFIG = get_config_data(os.path.join(BASE_DIR, 'config' ,'defaults.yml')) +DEFAULT_CONFIG = get_config_data(os.path.join(BASE_DIR, 'config', 'defaults.yml')) USER_CONFIG = get_config_data(os.path.expanduser(USER_CONFIG_DIR)) + def get_config(key): if USER_CONFIG and key in USER_CONFIG: return USER_CONFIG[key]