From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 14 May 2011 23:58:23 +0000 (-0700)
Subject: Slightly faster utf8 function
X-Git-Tag: v2.0.0~85^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f17ee1b35928ce16dcba66aac4cdec7b1f539cd;p=thirdparty%2Ftornado.git

Slightly faster utf8 function
---

diff --git a/tornado/escape.py b/tornado/escape.py
index ee4ffb68c..42c5ad764 100644
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -92,13 +92,12 @@ def url_unescape(value):
     return _unicode(urllib.unquote_plus(value))
 
 
+_UTF8_TYPES = (bytes, type(None))
 def utf8(value):
-    if value is None:
-        return None
-    if isinstance(value, unicode):
-        return value.encode("utf-8")
-    assert isinstance(value, bytes)
-    return value
+    if isinstance(value, _UTF8_TYPES):
+        return value
+    assert isinstance(value, unicode)
+    return value.encode("utf-8")
 
 
 # I originally used the regex from