starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up COMMENT constants

Browse Source
This commit is contained in:
Brad Warren
2016-08-16 17:45:43 -07:00
parent 3d4f822be0
commit 671d7ee194
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-nginx/certbot_nginx/parser.py
+3 -3
View File
@@ -525,8 +525,8 @@ def _add_directives(block, directives, replace):
REPEATABLE_DIRECTIVES = set(['server_name', 'listen', 'include']) REPEATABLE_DIRECTIVES = set(['server_name', 'listen', 'include'])
COMMENT_STR = ' managed by Certbot' COMMENT = ' managed by Certbot'
COMMENT = [' ', '#', ' managed by Certbot'] COMMENT_BLOCK = [' ', '#', COMMENT]
def _comment_directive(block, location): def _comment_directive(block, location):
@@ -541,7 +541,7 @@ def _comment_directive(block, location):
if "Certbot" in next_entry[-1]: if "Certbot" in next_entry[-1]:
return return
next_entry = next_entry.spaced[0] # pylint: disable=no-member next_entry = next_entry.spaced[0] # pylint: disable=no-member
block.insert(location + 1, COMMENT[:]) block.insert(location + 1, COMMENT_BLOCK[:])
if "\n" not in next_entry: if "\n" not in next_entry:
block.insert(location + 2, '\n') block.insert(location + 2, '\n')
certbot-nginx/certbot_nginx/tests/parser_test.py
+3 -3
View File
@@ -225,15 +225,15 @@ class NginxParserTest(util.NginxTest):
["\n", "a", " ", "b", "\n"], ["\n", "a", " ", "b", "\n"],
["c", " ", "d"], ["c", " ", "d"],
["\n", "e", " ", "f"]]) ["\n", "e", " ", "f"]])
from certbot_nginx.parser import _comment_directive, COMMENT from certbot_nginx.parser import _comment_directive, COMMENT_BLOCK
_comment_directive(block, 1) _comment_directive(block, 1)
_comment_directive(block, 0) _comment_directive(block, 0)
self.assertEqual(block.spaced, [ self.assertEqual(block.spaced, [
["\n", "a", " ", "b", "\n"], ["\n", "a", " ", "b", "\n"],
COMMENT, COMMENT_BLOCK,
"\n", "\n",
["c", " ", "d"], ["c", " ", "d"],
COMMENT, COMMENT_BLOCK,
["\n", "e", " ", "f"]]) ["\n", "e", " ", "f"]])
def test_get_all_certs_keys(self): def test_get_all_certs_keys(self):