Merge branch 'master' of https://github.com/facebook/tornado

Conflicts: tornado/test/iostream_test.py
bergundy · Jul 30, 2012 · 10a2db1 · 10a2db1
2 parents adb0da3 + e200903
commit 10a2db1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tornado/iostream.py b/tornado/iostream.py
@@ -650,7 +650,12 @@ def _do_ssl_handshake(self):
                                  ssl.SSL_ERROR_ZERO_RETURN):
                 return self.close()
             elif err.args[0] == ssl.SSL_ERROR_SSL:
-                logging.warning("SSL Error on %d: %s", self.socket.fileno(), err)
+                try:
+                    peer = self.socket.getpeername()
+                except:
+                    peer = '(not connected)'
+                logging.warning("SSL Error on %d %s: %s",
+                                self.socket.fileno(), peer, err)
                 return self.close()
             raise
         except socket.error, err:

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
@@ -263,14 +263,14 @@ def test_close_callback_with_pending_read(self):
             server.write(OK, server.close)
             client.read_until(b("\r\n"), self.stop)
             res = self.wait()
-            self.assertEquals(res, OK)
+            self.assertEqual(res, OK)
 
             client.read_until(b("\r\n"), lambda x: x)
             # If _close_callback (self.stop) is not called,
             # an AssertionError: Async operation timed out after 5 seconds
             # will be raised.
             res = self.wait()
-            self.assertIsNone(res)
+            self.assertTrue(res is None)
         finally:
             server.close()
             client.close()
diff --git a/tornado/web.py b/tornado/web.py
@@ -105,6 +105,8 @@ class RequestHandler(object):
     _template_loader_lock = threading.Lock()
 
     def __init__(self, application, request, **kwargs):
+        super(RequestHandler, self).__init__()
+
         self.application = application
         self.request = request
         self._headers_written = False