From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 25 May 2013 00:36:31 +0000 (-0400)
Subject: Improve error messages bytes/unicode conversion functions.
X-Git-Tag: v3.1.0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7d28e4ecc521d8f4431a0d5694f9fc975478602;p=thirdparty%2Ftornado.git

Improve error messages bytes/unicode conversion functions.
---

diff --git a/tornado/escape.py b/tornado/escape.py
index 688f7f087..0dedad5de 100644
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -179,7 +179,8 @@ def utf8(value):
     """
     if isinstance(value, _UTF8_TYPES):
         return value
-    assert isinstance(value, unicode_type)
+    assert isinstance(value, unicode_type), \
+        "Expected bytes, unicode, or None; got %r" % type(value)
     return value.encode("utf-8")
 
 _TO_UNICODE_TYPES = (unicode_type, type(None))
@@ -193,7 +194,8 @@ def to_unicode(value):
     """
     if isinstance(value, _TO_UNICODE_TYPES):
         return value
-    assert isinstance(value, bytes_type)
+    assert isinstance(value, bytes_type), \
+        "Expected bytes, unicode, or None; got %r" % type(value)
     return value.decode("utf-8")
 
 # to_unicode was previously named _unicode not because it was private,
@@ -221,7 +223,8 @@ def to_basestring(value):
     """
     if isinstance(value, _BASESTRING_TYPES):
         return value
-    assert isinstance(value, bytes_type)
+    assert isinstance(value, bytes_type), \
+        "Expected bytes, unicode, or None; got %r" % type(value)
     return value.decode("utf-8")