From 76dc01280761e2b4566c0afa6ae00ab752b7a2fd Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Wed, 19 Mar 2014 14:34:55 -0400 Subject: Options: rename _set_defaults to _set_defaults_from_config This is to make the method name more in line with what it does --- src/lib/Bcfg2/Options/Parser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py index f05205143..b8b25f710 100644 --- a/src/lib/Bcfg2/Options/Parser.py +++ b/src/lib/Bcfg2/Options/Parser.py @@ -126,7 +126,7 @@ class Parser(argparse.ArgumentParser): if hasattr(component, "options"): self.add_options(getattr(component, "options")) - def _set_defaults(self): + def _set_defaults_from_config(self): """ Set defaults from the config file for all options that can come from the config file, but haven't yet had their default set """ @@ -181,7 +181,7 @@ class Parser(argparse.ArgumentParser): self._reset_namespace() self._cfp.read([cfile]) self._defaults_set = [] - self._set_defaults() + self._set_defaults_from_config() if reparse: self._parse_config_options() self._config_files.append(dest) @@ -257,7 +257,7 @@ class Parser(argparse.ArgumentParser): self._parse_config_options() while not self.parsed: self.parsed = True - self._set_defaults() + self._set_defaults_from_config() self.parse_known_args(args=self.argv, namespace=self.namespace) self._parse_config_options() self._finalize() -- cgit v1.2.3-1-g7c22