upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 14:54:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'parserinterfaces_2' of github.com:certbot/certbot into parserinterfaces_2

Browse source
This commit is contained in:
Joona Hoikkala 2019-08-27 17:30:07 +03:00
commit 6b9806cb75
No known key found for this signature in database
GPG key ID: D5AA86BBF9B29A5C
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
certbot-apache/certbot_apache/interfaces.py
View file

@ -234,7 +234,7 @@ class DirectiveNode(ParserNode):
:param tuple parameters: Tuple of str parameters for this DirectiveNode.
Default: ().
:param ancestor: BlockNode ancestor for this DirectiveNode, or None for
root configuratio node. Required.
root configuration node. Required.
:param filepath: Filesystem path for the file where this DirectiveNode
does or should exist in the filesystem, or None for directives introduced
in the httpd command line. Required.

4
certbot-apache/certbot_apache/parsernode_util.py
View file

@ -45,7 +45,7 @@ def commentnode_kwargs(kwargs):
:param dict kwargs: Keyword argument dictionary to validate.
:returns: Tuple of validated and prepared arguments and the remaining kwargs.
:returns: Tuple of validated and prepared arguments and ParserNode kwargs.
"""
kwargs.setdefault("dirty", False)
kwargs = validate_kwargs(kwargs, ["ancestor", "dirty", "filepath", "comment"])
@ -61,7 +61,7 @@ def node_kwargs(kwargs):
:param dict kwargs: Keyword argument dictionary to validate.
:returns: Tuple of validated and prepared arguments.
:returns: Tuple of validated and prepared arguments and ParserNode kwargs.
"""
kwargs.setdefault("dirty", False)
kwargs.setdefault("enabled", True)