Browse Source

Update fix for API response header for JSON content type and the return of JSONP data to updated package as listed in hacks.txt.

pull/334/head
JackDandy 10 years ago
committed by JackDandy
parent
commit
4a9ee3fe62
  1. 1
      CHANGES.md
  2. 5
      tornado/web.py

1
CHANGES.md

@ -2,6 +2,7 @@
* Update Tornado webserver to 4.2.dev1 (609dbb9)
* Update change to suppress reporting of Tornado exception error 1 to updated package as listed in hacks.txt
* Update fix for API response header for JSON content type and the return of JSONP data to updated package as listed in hacks.txt
* Change network names to only display on top line of Day by Day layout on Episode View
* Reposition country part of network name into the hover over in Day by Day layout
* Add ToTV provider

5
tornado/web.py

@ -694,7 +694,10 @@ class RequestHandler(object):
message += ". Lists not accepted for security reasons; see http://www.tornadoweb.org/en/stable/web.html#tornado.web.RequestHandler.write"
raise TypeError(message)
if isinstance(chunk, dict):
chunk = escape.json_encode(chunk)
if 'unwrap_json' in chunk:
chunk = chunk['unwrap_json']
else:
chunk = escape.json_encode(chunk)
self.set_header("Content-Type", "application/json; charset=UTF-8")
chunk = utf8(chunk)
self._write_buffer.append(chunk)

Loading…
Cancel
Save