From 817ab468d1335ac09a56cef75050525739f2e1e5 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 9 Sep 2015 20:21:33 +0000
Subject: [PATCH 1/3] py3 compat: str(exc) instead of exc.message

---
 acme/acme/messages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acme/acme/messages.py b/acme/acme/messages.py
index 2d82ccb5e..1a7463fba 100644
--- a/acme/acme/messages.py
+++ b/acme/acme/messages.py
@@ -158,7 +158,7 @@ class Directory(jose.JSONDeSerializable):
         try:
             return self[name.replace('_', '-')]
         except KeyError as error:
-            raise AttributeError(error.message)
+            raise AttributeError(str(error))
 
     def __getitem__(self, name):
         try:

From c93564b99ec4fdf7cc2016cb169fc94fd41a250a Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 9 Sep 2015 20:21:57 +0000
Subject: [PATCH 2/3] Travis: update --server to point at directory

---
 tests/integration/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh
index 8656b8518..c8b142cf2 100755
--- a/tests/integration/_common.sh
+++ b/tests/integration/_common.sh
@@ -13,7 +13,7 @@ export root store_flags
 
 letsencrypt_test () {
     letsencrypt \
-        --server "${SERVER:-http://localhost:4000/acme/new-reg}" \
+        --server "${SERVER:-http://localhost:4000/directory}" \
         --no-verify-ssl \
         --dvsni-port 5001 \
         --simple-http-port 5001 \

From ed051b7c28a67109582caf6bc0ff42a3dc95b4fe Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 9 Sep 2015 20:40:04 +0000
Subject: [PATCH 3/3] Boulder Monolithic does not exist

---
 tests/boulder-integration.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh
index 23bfcf3ca..786ceb1b2 100755
--- a/tests/boulder-integration.sh
+++ b/tests/boulder-integration.sh
@@ -4,9 +4,7 @@
 # instance (see ./boulder-start.sh).
 #
 # Environment variables:
-#   SERVER: Passed as "letsencrypt --server" argument. Boulder
-#           monolithic defaults to :4000, AMQP defaults to :4300. This
-#           script defaults to monolithic.
+#   SERVER: Passed as "letsencrypt --server" argument.
 #
 # Note: this script is called by Boulder integration test suite!