From 88c824c0ec2a4a7fe88f93bf22b949d8e2b8f4c1 Mon Sep 17 00:00:00 2001 From: Ceesjan Luiten Date: Sat, 11 Jul 2015 11:04:25 +0200 Subject: [PATCH] End nginx configuration files with a newline --- letsencrypt-nginx/letsencrypt_nginx/nginxparser.py | 2 +- letsencrypt-nginx/letsencrypt_nginx/tests/nginxparser_test.py | 2 +- .../tests/testdata/etc_nginx/minimalistic_comments.new.conf | 2 +- .../letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py index a22355c4b..7870581b4 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py +++ b/letsencrypt-nginx/letsencrypt_nginx/nginxparser.py @@ -85,7 +85,7 @@ class RawNginxDumper(object): def as_string(self): """Return the parsed block as a string.""" - return '\n'.join(self) + return '\n'.join(self) + '\n' # Shortcut functions to respect Python's serialization interface diff --git a/letsencrypt-nginx/letsencrypt_nginx/tests/nginxparser_test.py b/letsencrypt-nginx/letsencrypt_nginx/tests/nginxparser_test.py index 718ea1e85..0d6e5c453 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/tests/nginxparser_test.py +++ b/letsencrypt-nginx/letsencrypt_nginx/tests/nginxparser_test.py @@ -63,7 +63,7 @@ class TestRawNginxParser(unittest.TestCase): ' image/jpeg jpg;\n' ' }\n' ' }\n' - '}') + '}\n') def test_parse_from_file(self): with open(util.get_data_filename('foo.conf')) as handle: diff --git a/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/minimalistic_comments.new.conf b/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/minimalistic_comments.new.conf index 963490603..d1b7be91e 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/minimalistic_comments.new.conf +++ b/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/minimalistic_comments.new.conf @@ -8,4 +8,4 @@ server { # listen 1234; # listen 80; -} \ No newline at end of file +} diff --git a/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf b/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf index 6beec1ced..59c1c968f 100644 --- a/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf +++ b/letsencrypt-nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf @@ -80,4 +80,4 @@ http { index index.html index.htm; } } -} \ No newline at end of file +}