Fix deprecation warnings in python 3

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 89459b34cd1fef2bd11f6d41be3b282e265b5c4b..888e777f127320394aee96ffadfa416507c7ddf4 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -16,7 +16,6 @@
 
 """A non-blocking, single-threaded HTTP server."""
 
-import cgi
 import errno
 import logging
 import os
@@ -30,6 +29,11 @@ from tornado import iostream
 from tornado import stack_context
 from tornado.util import b, bytes_type
 
+try:
+    from urlparse import parse_qs  # Python 2.6+
+except ImportError:
+    from cgi import parse_qs
+
 try:
     import fcntl
 except ImportError:
@@ -364,7 +368,7 @@ class HTTPConnection(object):
         content_type = self._request.headers.get("Content-Type", "")
         if self._request.method in ("POST", "PUT"):
             if content_type.startswith("application/x-www-form-urlencoded"):
-                arguments = cgi.parse_qs(self._request.body)
+                arguments = parse_qs(self._request.body)
                 for name, values in arguments.iteritems():
                     name = name.decode('utf-8')
                     values = [v for v in values if v]
@@ -478,7 +482,7 @@ class HTTPRequest(object):
         scheme, netloc, path, query, fragment = urlparse.urlsplit(uri)
         self.path = path
         self.query = query
-        arguments = cgi.parse_qs(query)
+        arguments = parse_qs(query)
         self.arguments = {}
         for name, values in arguments.iteritems():
             values = [v for v in values if v]

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index fb56f6e752bde0417a4d0b626065b4eae91e5a3f..1cff9e5df4bb7bd78ae22881c14a6e387f37193b 100644 (file)
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -217,7 +217,7 @@ class SimpleHTTPClientTestCase(AsyncHTTPTestCase, LogTrapTestCase):
         self.assertTrue(response.headers["Location"].endswith("/countdown/1"))
 
     def test_default_certificates_exist(self):
-        open(_DEFAULT_CA_CERTS)
+        open(_DEFAULT_CA_CERTS).close()
 
     def test_credentials_in_url(self):
         url = self.get_url("/auth").replace("http://", "http://me:secret@")

diff --git a/tornado/test/stack_context_test.py b/tornado/test/stack_context_test.py
index a9e20db3de8d16ae71ce97c910e441066be90758..b79f1e328f73448784cb6b80405d7d47ae44116e 100755 (executable)
--- a/tornado/test/stack_context_test.py
+++ b/tornado/test/stack_context_test.py
@@ -46,7 +46,7 @@ class HTTPStackContextTest(AsyncHTTPTestCase, LogTrapTestCase):
     def test_stack_context(self):
         self.http_client.fetch(self.get_url('/'), self.handle_response)
         self.wait()
-        self.assertEquals(self.response.code, 500)
+        self.assertEqual(self.response.code, 500)
         self.assertTrue(b('got expected exception') in self.response.body)
 
     def handle_response(self, response):

diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index 8941332d027b44603ec2982a572bd7978d1c4759..123d82ee055a70b6d81544bdfc06ec52c085f233 100644 (file)
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -27,7 +27,7 @@ class SecureCookieTest(LogTrapTestCase):
     def test_round_trip(self):
         handler = CookieTestRequestHandler()
         handler.set_secure_cookie('foo', b('bar'))
-        self.assertEquals(handler.get_secure_cookie('foo'), b('bar'))
+        self.assertEqual(handler.get_secure_cookie('foo'), b('bar'))
 
     def test_cookie_tampering_future_timestamp(self):
         handler = CookieTestRequestHandler()