upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 08:12:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add defaults to helpful_parser

Browse source
This commit is contained in:
Brad Warren 2016-06-13 17:31:57 -07:00
parent 4c68792dd3
commit 97af8dfb70
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
certbot/cli.py
View file

@ -105,11 +105,6 @@ ZERO_ARG_ACTIONS = set(("store_const", "store_true",
"store_false", "append_const", "count",))
# Maps a config option to its default value. This is set during the
# parse_args method of HelpfulArgumentParser.
DEFAULTS = None
# Maps a config option to a set of config options that may have modified it.
# This dictionary is used recursively, so if A modifies B and B modifies C,
# it is determined that C was modified by the user if A was modified.
@ -229,7 +224,8 @@ def has_default_value(option, value):
:rtype: bool
"""
return option in DEFAULTS and DEFAULTS[option] == value
return (option in helpful_parser.defaults and
helpful_parser.defaults[option] == value)
def option_was_set(option, value):
@ -354,6 +350,7 @@ class HelpfulArgumentParser(object):
sys.exit(0)
self.visible_topics = self.determine_help_topics(self.help_arg)
self.groups = {} # elements are added by .add_group()
self.defaults = {} # elements are added by .parse_args()
def parse_args(self):
"""Parses command line arguments and returns the result.
@ -369,9 +366,8 @@ class HelpfulArgumentParser(object):
if self.detect_defaults:
return parsed_args
global DEFAULTS # pylint: disable=global-statement
DEFAULTS = dict((key, copy.deepcopy(self.parser.get_default(key)))
for key in vars(parsed_args))
self.defaults = dict((key, copy.deepcopy(self.parser.get_default(key)))
for key in vars(parsed_args))
# Do any post-parsing homework here

5
certbot/tests/storage_test.py
View file

@ -533,10 +533,9 @@ class RenewableCertTests(BaseRenewableCertTest):
"""Test that relevant_values() can reject a default value."""
# pylint: disable=protected-access
from certbot import storage
mock_parser.verb = "certonly"
mock_parser.args = ["--standalone"]
mock_action = mock.Mock(dest="rsa_key_size", default=2048)
mock_parser.parser._actions = [mock_action]
mock_parser.defaults = {"rsa_key_size": 2048}
mock_parser.verb = "certonly"
self.assertEqual(storage.relevant_values({"rsa_key_size": 2048}), {})
@mock.patch("certbot.cli.helpful_parser")