From 7a29450f9ac63ea62114cfbd30bb6d0afa43a7d4 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 4 Jun 2015 16:48:17 +0100 Subject: [PATCH] Update Tornado webserver to 4.2 (fdfaf3d). --- CHANGES.md | 3 ++- tornado/__init__.py | 4 ++-- tornado/httputil.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4d59ddb4..627ca184 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ ### 0.10.0 (2015-xx-xx xx:xx:xx UTC) * Remove EZRSS provider -* Update Tornado webserver to 4.2b1 (61a16c9) +* Update Tornado webserver to 4.2 (fdfaf3d) * Update change to suppress reporting of Tornado exception error 1 to updated package (ref:hacks.txt) * Update fix for API response header for JSON content type and the return of JSONP data to updated package (ref:hacks.txt) * Update Requests library 2.6.2 to 2.7.0 (8b5e457) @@ -21,6 +21,7 @@ [develop changelog] * Update Requests library 2.7.0 (ab1f493) to 2.7.0 (8b5e457) +* Update Tornado webserver from 4.2.dev1 (609dbb9) to 4.2b1 (61a16c9) ### 0.9.1 (2015-05-25 03:03:00 UTC) diff --git a/tornado/__init__.py b/tornado/__init__.py index 80f21ddd..29e87041 100644 --- a/tornado/__init__.py +++ b/tornado/__init__.py @@ -25,5 +25,5 @@ from __future__ import absolute_import, division, print_function, with_statement # is zero for an official release, positive for a development branch, # or negative for a release candidate or beta (after the base version # number has been incremented) -version = "4.2b1" -version_info = (4, 2, 0, -99) +version = "4.2" +version_info = (4, 2, 0, 0) diff --git a/tornado/httputil.py b/tornado/httputil.py index f5fea213..fa5e697c 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -394,7 +394,7 @@ class HTTPServerRequest(object): """ assert isinstance(chunk, bytes) assert self.version.startswith("HTTP/1."), \ - "deprecated interface ony supported in HTTP/1.x" + "deprecated interface only supported in HTTP/1.x" self.connection.write(chunk, callback=callback) def finish(self):