summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options
diff options
context:
space:
mode:
authorMichael Fenn <fennm@deshawresearch.com>2014-03-19 14:34:55 -0400
committerMichael Fenn <fennm@deshawresearch.com>2014-03-19 14:38:08 -0400
commit76dc01280761e2b4566c0afa6ae00ab752b7a2fd (patch)
treee0155c2b713d751617a9c78fe866438032b38c67 /src/lib/Bcfg2/Options
parent8b1d8d83ef6afd408c8d3777f52111919cb31253 (diff)
downloadbcfg2-76dc01280761e2b4566c0afa6ae00ab752b7a2fd.tar.gz
bcfg2-76dc01280761e2b4566c0afa6ae00ab752b7a2fd.tar.bz2
bcfg2-76dc01280761e2b4566c0afa6ae00ab752b7a2fd.zip
Options: rename _set_defaults to _set_defaults_from_config
This is to make the method name more in line with what it does
Diffstat (limited to 'src/lib/Bcfg2/Options')
-rw-r--r--src/lib/Bcfg2/Options/Parser.py6
1 files changed, 3 insertions, 3 deletions
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()