From 0113708d2e4ab4075e6e738966d27f8ee359e399 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 25 Aug 2022 21:13:23 +0200 Subject: [PATCH] refactoring --- dotdrop/options.py | 8 +++++--- tests/test_jhelpers.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dotdrop/options.py b/dotdrop/options.py index 9f3a68f..8f6984a 100644 --- a/dotdrop/options.py +++ b/dotdrop/options.py @@ -17,7 +17,7 @@ from docopt import docopt from dotdrop.version import __version__ as VERSION from dotdrop.linktypes import LinkTypes from dotdrop.logger import Logger -from dotdrop.cfg_aggregator import CfgAggregator as Cfg +from dotdrop.cfg_aggregator import CfgAggregator from dotdrop.action import Action from dotdrop.utils import uniq_list, debug_list, debug_dict from dotdrop.exceptions import YamlException @@ -253,8 +253,10 @@ class Options(AttrMonitor): def _read_config(self): """read the config file""" - self.conf = Cfg(self.confpath, self.profile, debug=self.debug, - dry=self.dry) + self.conf = CfgAggregator(self.confpath, + self.profile, + debug=self.debug, + dry=self.dry) # transform the config settings to self attribute settings = self.conf.get_settings() debug_dict('effective settings', settings, self.debug) diff --git a/tests/test_jhelpers.py b/tests/test_jhelpers.py index 1eb4ce5..114d9bb 100644 --- a/tests/test_jhelpers.py +++ b/tests/test_jhelpers.py @@ -7,7 +7,7 @@ basic unittest for jhelpers import os import unittest -from dotdrop.cfg_aggregator import CfgAggregator as Cfg +from dotdrop.cfg_aggregator import CfgAggregator from tests.helpers import (clean, create_random_file, get_string, get_tempdir, load_options) @@ -97,7 +97,7 @@ dirname: /tmp/a/b profile = get_string(5) confpath = os.path.join(tmp, self.CONFIG_NAME) self.fake_config(confpath, d1, profile, tmp) - conf = Cfg(confpath, profile, debug=True) + conf = CfgAggregator(confpath, profile, debug=True) self.assertTrue(conf is not None) # install them