From 3fb990ac9bc4b71c262d97c153452e8d9a225a24 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 14 Mar 2016 17:19:22 -0700
Subject: [PATCH] fixes #2661

---
 letsencrypt/le_util.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/letsencrypt/le_util.py b/letsencrypt/le_util.py
index c8a9d24c2..a92ce6e89 100644
--- a/letsencrypt/le_util.py
+++ b/letsencrypt/le_util.py
@@ -6,6 +6,7 @@ import logging
 import os
 import platform
 import re
+import six
 import socket
 import stat
 import subprocess
@@ -310,10 +311,13 @@ def enforce_domain_sanity(domain):
     # Unicode
     try:
         domain = domain.encode('ascii').lower()
-    except UnicodeDecodeError:
-        raise errors.ConfigurationError(
-            "Internationalized domain names are not presently supported: {0}"
-            .format(domain))
+    except UnicodeError:
+        error_fmt = ("Internationalized domain names "
+                     "are not presently supported: {0}")
+        if isinstance(domain, six.text_type):
+            raise errors.ConfigurationError(unicode(error_fmt).format(domain))
+        else:
+            raise errors.ConfigurationError(error_fmt.format(domain))
 
     # Remove trailing dot
     domain = domain[:-1] if domain.endswith('.') else domain