Merge pull request tornadoweb#2360 from bdarnell/httpserver-deprecation

httputil: Deprecate some server-side HTTP interfaces

Author: bdarnell

tornado/http1connection.py

@@ -277,8 +277,14 @@ def _clear_callbacks(self):
     def set_close_callback(self, callback):
         """Sets a callback that will be run when the connection is closed.
 
-        .. deprecated:: 4.0
-            Use `.HTTPMessageDelegate.on_connection_close` instead.
+        Note that this callback is slightly different from
+        `.HTTPMessageDelegate.on_connection_close`: The
+        `.HTTPMessageDelegate` method is called when the connection is
+        closed while recieving a message. This callback is used when
+        there is not an active delegate (for example, on the server
+        side this callback is used if the client closes the connection
+        after sending its request but before receiving all the
+        response.
         """
         self._close_callback = stack_context.wrap(callback)
 

tornado/httputil.py

@@ -29,6 +29,7 @@
 import numbers
 import re
 import time
+import warnings
 
 from tornado.escape import native_str, parse_qs_bytes, utf8
 from tornado.log import gen_log
@@ -380,10 +381,15 @@ def supports_http_1_1(self):
         """Returns True if this request supports HTTP/1.1 semantics.
 
         .. deprecated:: 4.0
-           Applications are less likely to need this information with the
-           introduction of `.HTTPConnection`.  If you still need it, access
-           the ``version`` attribute directly.
+
+           Applications are less likely to need this information with
+           the introduction of `.HTTPConnection`. If you still need
+           it, access the ``version`` attribute directly. This method
+           will be removed in Tornado 6.0.
+
         """
+        warnings.warn("supports_http_1_1() is deprecated, use request.version instead",
+                      DeprecationWarning)
         return self.version == "HTTP/1.1"
 
     @property
@@ -412,8 +418,10 @@ def write(self, chunk, callback=None):
 
         .. deprecated:: 4.0
            Use ``request.connection`` and the `.HTTPConnection` methods
-           to write the response.
+           to write the response. This method will be removed in Tornado 6.0.
         """
+        warnings.warn("req.write deprecated, use req.connection.write and write_headers instead",
+                      DeprecationWarning)
         assert isinstance(chunk, bytes)
         assert self.version.startswith("HTTP/1."), \
             "deprecated interface only supported in HTTP/1.x"
@@ -424,8 +432,10 @@ def finish(self):
 
         .. deprecated:: 4.0
            Use ``request.connection`` and the `.HTTPConnection` methods
-           to write the response.
+           to write the response. This method will be removed in Tornado 6.0.
         """
+        warnings.warn("req.finish deprecated, use req.connection.finish instead",
+                      DeprecationWarning)
         self.connection.finish()
         self._finish_time = time.time()
 

tornado/test/httpserver_test.py

@@ -1152,10 +1152,10 @@ def handle_request(request):
                 request.connection.finish()
                 return
             message = b"Hello world"
-            request.write(utf8("HTTP/1.1 200 OK\r\n"
-                               "Content-Length: %d\r\n\r\n" % len(message)))
-            request.write(message)
-            request.finish()
+            request.connection.write(utf8("HTTP/1.1 200 OK\r\n"
+                                          "Content-Length: %d\r\n\r\n" % len(message)))
+            request.connection.write(message)
+            request.connection.finish()
         return handle_request
 
     def test_legacy_interface(self):

tornado/web.py

@@ -1016,7 +1016,7 @@ def finish(self, chunk=None):
             self.request.connection.set_close_callback(None)
 
         self.flush(include_footers=True)
-        self.request.finish()
+        self.request.connection.finish()
         self._log()
         self._finished = True
         self.on_finish()