upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-03 13:59:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactor to simplify indenation handling

Browse source
This commit is contained in:
Peter Eckersley 2016-06-23 17:59:26 -07:00
parent a29c6e3102
commit 6930523c14
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
certbot-nginx/certbot_nginx/nginxparser.py
View file

@ -41,7 +41,7 @@ class RawNginxParser(object):
block = Forward()
block << Group(
# XXX could this "key" be Literal("location")?
# key could for instance be "server" or "http"
(Group(space + key + location_statement) ^ Group(if_statement) ^
Group(map_statement)).leaveWhitespace() +
left_bracket +
@ -78,15 +78,14 @@ class RawNginxDumper(object):
b = copy.deepcopy(b0)
indentation = ""
if spacey(b[0]):
indentation = b.pop(0)
yield b.pop(0) # indentation
if not b:
yield indentation
continue
key = b.pop(0)
values = b.pop(0)
if isinstance(key, list):
yield indentation + "".join(key) + '{'
yield "".join(key) + '{'
for parameter in values:
dumped = self.__iter__([parameter])
for line in dumped:
@ -94,7 +93,7 @@ class RawNginxDumper(object):
yield '}'
else:
if isinstance(key, str) and key.strip() == '#':
yield indentation + key + values
yield key + values
else:
gap = ""
# Sometimes the parser has stuck some gap whitespace in here;
@ -102,7 +101,7 @@ class RawNginxDumper(object):
if values and spacey(values):
gap = values
values = b.pop(0)
yield indentation + key + gap + values + ';'
yield key + gap + values + ';'
def __str__(self):
"""Return the parsed block as a string."""