From 2cd0e64537a2c774f549386640f8f9be12b1fe73 Mon Sep 17 00:00:00 2001 From: lf Date: Wed, 14 Oct 2015 22:35:52 -0600 Subject: [PATCH 1/3] Change as_string to a __str__ in nginxparser.py This change would make the RawNginxDumper more in line with other Python libraries and the standard library. --- letsencrypt-nginx/letsencrypt_nginx/nginxparser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py index 2926a43d0..84b54b4db 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py +++ b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py @@ -84,9 +84,13 @@ class RawNginxDumper(object): else: yield spacer * current_indent + key + spacer + values + ';' - def as_string(self): + def __str__(self): """Return the parsed block as a string.""" return '\n'.join(self) + '\n' + + def as_string(self): + """Return the parsed block as a string.""" + return str(self) # Shortcut functions to respect Python's serialization interface @@ -122,7 +126,7 @@ def dumps(blocks, indentation=4): :rtype: str """ - return RawNginxDumper(blocks, indentation).as_string() + return str(RawNginxDumper(blocks, indentation)) def dump(blocks, _file, indentation=4): From 2956d5d913a262cb11f53e8eda012abf6ad1958d Mon Sep 17 00:00:00 2001 From: lf Date: Thu, 15 Oct 2015 21:28:32 -0600 Subject: [PATCH 2/3] Trailing whitespace. Oops. --- letsencrypt-nginx/letsencrypt_nginx/nginxparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py index 84b54b4db..c9a24aabe 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py +++ b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py @@ -87,7 +87,7 @@ class RawNginxDumper(object): def __str__(self): """Return the parsed block as a string.""" return '\n'.join(self) + '\n' - + def as_string(self): """Return the parsed block as a string.""" return str(self) From 670bc1e3d3f6145e98060a069806781cc22695ba Mon Sep 17 00:00:00 2001 From: lf Date: Fri, 16 Oct 2015 19:03:21 -0600 Subject: [PATCH 3/3] Remove as_string as per request. --- letsencrypt-nginx/letsencrypt_nginx/nginxparser.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py index c9a24aabe..cef0756d7 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py +++ b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py @@ -88,10 +88,6 @@ class RawNginxDumper(object): """Return the parsed block as a string.""" return '\n'.join(self) + '\n' - def as_string(self): - """Return the parsed block as a string.""" - return str(self) - # Shortcut functions to respect Python's serialization interface # (like pyyaml, picker or json)