From 54c74a6d2fa6cc134676758142075db43f738b2a Mon Sep 17 00:00:00 2001 From: Anselm Levskaya Date: Wed, 2 Dec 2015 23:06:11 -0800 Subject: [PATCH 1/2] fix sudo issue on amazon linux instance with letsencrypt-auto the letsencrypt-auto script was missing the sudo parameter on call to ExperimentalBootstrap for amazon linux. also added comment to mac entry to clarify why it lacks the parameter --- letsencrypt-auto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/letsencrypt-auto b/letsencrypt-auto index c88028b72..44c71883c 100755 --- a/letsencrypt-auto +++ b/letsencrypt-auto @@ -147,9 +147,9 @@ then elif uname | grep -iq FreeBSD ; then ExperimentalBootstrap "FreeBSD" freebsd.sh "$SUDO" elif uname | grep -iq Darwin ; then - ExperimentalBootstrap "Mac OS X" mac.sh + ExperimentalBootstrap "Mac OS X" mac.sh # homebrew doesn't normally run as root elif grep -iq "Amazon Linux" /etc/issue ; then - ExperimentalBootstrap "Amazon Linux" _rpm_common.sh + ExperimentalBootstrap "Amazon Linux" _rpm_common.sh "$SUDO" else echo "Sorry, I don't know how to bootstrap Let's Encrypt on your operating system!" echo From c7dbf8aa24ca08cc977b5bdef3003eeeee3513aa Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Wed, 2 Dec 2015 16:12:47 +0200 Subject: [PATCH 2/2] Avoid trailing whitespace in pretty-printed JSON Fixes a failing test on Python 3.3: ====================================================================== FAIL: test_json_dumps_pretty (acme.jose.interfaces_test.JSONDeSerializableTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/mg/src/letsencrypt/acme/acme/jose/interfaces_test.py", line 97, in test_json_dumps_pretty '[\n "foo1",{0}\n "foo2"\n]'.format(filler)) AssertionError: '[\n "foo1", \n "foo2"\n]' != '[\n "foo1",\n "foo2"\n]' [ - "foo1", ? - + "foo1", "foo2" ] ---------------------------------------------------------------------- (The test expected trailing whitespace on Python < 3.0, while it should've been checking for Python < 3.4.) --- acme/acme/jose/interfaces.py | 2 +- acme/acme/jose/interfaces_test.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/acme/acme/jose/interfaces.py b/acme/acme/jose/interfaces.py index f85777a30..f841848b3 100644 --- a/acme/acme/jose/interfaces.py +++ b/acme/acme/jose/interfaces.py @@ -194,7 +194,7 @@ class JSONDeSerializable(object): :rtype: str """ - return self.json_dumps(sort_keys=True, indent=4) + return self.json_dumps(sort_keys=True, indent=4, separators=(',', ': ')) @classmethod def json_dump_default(cls, python_object): diff --git a/acme/acme/jose/interfaces_test.py b/acme/acme/jose/interfaces_test.py index 84dc2a1be..cf98ff371 100644 --- a/acme/acme/jose/interfaces_test.py +++ b/acme/acme/jose/interfaces_test.py @@ -1,8 +1,6 @@ """Tests for acme.jose.interfaces.""" import unittest -import six - class JSONDeSerializableTest(unittest.TestCase): # pylint: disable=too-many-instance-attributes @@ -92,9 +90,8 @@ class JSONDeSerializableTest(unittest.TestCase): self.assertEqual('["foo1", "foo2"]', self.seq.json_dumps()) def test_json_dumps_pretty(self): - filler = ' ' if six.PY2 else '' self.assertEqual(self.seq.json_dumps_pretty(), - '[\n "foo1",{0}\n "foo2"\n]'.format(filler)) + '[\n "foo1",\n "foo2"\n]') def test_json_dump_default(self): from acme.jose.interfaces import JSONDeSerializable