From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 9 May 2013 02:40:27 +0000 (-0400)
Subject: Add note about frequently-seen pull request to add **kwargs to json_encode.
X-Git-Tag: v3.1.0~76^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10cb3988724546b19885edac07f6569b05f04b60;p=thirdparty%2Ftornado.git

Add note about frequently-seen pull request to add **kwargs to json_encode.
---

diff --git a/tornado/escape.py b/tornado/escape.py
index 016fdade8..546bd2ea8 100644
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -64,6 +64,9 @@ def xhtml_unescape(value):
     return re.sub(r"&(#?)(\w+?);", _convert_entity, _unicode(value))
 
 
+# The fact that json_encode wraps json.dumps is an implementation detail.
+# Please see https://github.com/facebook/tornado/pull/706
+# before sending a pull request that adds **kwargs to this function.
 def json_encode(value):
     """JSON-encodes the given Python object."""
     # JSON permits but does not require forward slashes to be escaped.