[Python-modules-commits] [python-tornado] 01/10: Import python-tornado_4.4.0.orig.tar.gz

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository python-tornado.

commit 22d6b922f8043ee903340dc670a753f1ccad0a8d
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Jul 16 22:46:17 2016 +0200

    Import python-tornado_4.4.0.orig.tar.gz
---
 README.rst                             |  4 ++++
 demos/benchmark/benchmark.py           | 10 +++++-----
 docs/releases/v4.4.0.rst               |  4 ++--
 setup.py                               |  2 +-
 tornado/__init__.py                    |  4 ++--
 tornado/test/simple_httpclient_test.py | 13 +++++++------
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README.rst b/README.rst
index 42e7d61..c177ef1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,10 @@
 Tornado Web Server
 ==================
 
+.. image:: https://badges.gitter.im/Join%20Chat.svg
+   :alt: Join the chat at https://gitter.im/tornadoweb/tornado
+   :target: https://gitter.im/tornadoweb/tornado?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
 `Tornado <http://www.tornadoweb.org>`_ is a Python web framework and
 asynchronous networking library, originally developed at `FriendFeed
 <http://friendfeed.com>`_.  By using non-blocking network I/O, Tornado
diff --git a/demos/benchmark/benchmark.py b/demos/benchmark/benchmark.py
index 6a0354d..1e8375d 100755
--- a/demos/benchmark/benchmark.py
+++ b/demos/benchmark/benchmark.py
@@ -54,7 +54,7 @@ class RootHandler(RequestHandler):
         pass
 
 def handle_sigchld(sig, frame):
-    IOLoop.instance().add_callback_from_signal(IOLoop.instance().stop)
+    IOLoop.current().add_callback_from_signal(IOLoop.current().stop)
 
 def main():
     parse_command_line()
@@ -64,6 +64,7 @@ def main():
         run()
 
 def run():
+    io_loop = IOLoop(make_current=True)
     app = Application([("/", RootHandler)])
     port = random.randrange(options.min_port, options.max_port)
     app.listen(port, address='127.0.0.1')
@@ -78,10 +79,9 @@ def run():
         args.append("-q")
     args.append("http://127.0.0.1:%d/" % port)
     subprocess.Popen(args)
-    IOLoop.instance().start()
-    IOLoop.instance().close()
-    del IOLoop._instance
-    assert not IOLoop.initialized()
+    io_loop.start()
+    io_loop.close()
+    io_loop.clear_current()
 
 if __name__ == '__main__':
     main()
diff --git a/docs/releases/v4.4.0.rst b/docs/releases/v4.4.0.rst
index caa62e1..fa7c817 100644
--- a/docs/releases/v4.4.0.rst
+++ b/docs/releases/v4.4.0.rst
@@ -1,8 +1,8 @@
 What's new in Tornado 4.4
 =========================
 
-In progress
------------
+Jul 15, 2016
+------------
 
 General
 ~~~~~~~
diff --git a/setup.py b/setup.py
index a64bc3a..836c363 100644
--- a/setup.py
+++ b/setup.py
@@ -103,7 +103,7 @@ http://api.mongodb.org/python/current/installation.html#osx
 
 kwargs = {}
 
-version = "4.4b1"
+version = "4.4"
 
 with open('README.rst') as f:
     kwargs['long_description'] = f.read()
diff --git a/tornado/__init__.py b/tornado/__init__.py
index 7fe00e1..140d171 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.4b1"
-version_info = (4, 4, 0, -99)
+version = "4.4"
+version_info = (4, 4, 0, 0)
diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index a5624af..861602b 100644
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -631,12 +631,13 @@ class HTTP204NoContentTestCase(AsyncHTTPTestCase):
 
     def test_204_invalid_content_length(self):
         # 204 status with non-zero content length is malformed
-        response = self.fetch("/?error=1")
-        if not self.http1:
-            self.skipTest("requires HTTP/1.x")
-        if self.http_client.configured_class != SimpleAsyncHTTPClient:
-            self.skipTest("curl client accepts invalid headers")
-        self.assertEqual(response.code, 599)
+        with ExpectLog(gen_log, ".*Response with code 204 should not have body"):
+            response = self.fetch("/?error=1")
+            if not self.http1:
+                self.skipTest("requires HTTP/1.x")
+            if self.http_client.configured_class != SimpleAsyncHTTPClient:
+                self.skipTest("curl client accepts invalid headers")
+            self.assertEqual(response.code, 599)
 
 
 class HostnameMappingTestCase(AsyncHTTPTestCase):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-tornado.git