Remove HTTPServer.__init__'s **kwargs.

New keyword arguments to this constructor are no longer likely to
be simple pass-through arguments to TCPServer.

diff --git a/tornado/http1connection.py b/tornado/http1connection.py
index 44480f604f781cfdb4f45b73735da02b6ebb26da..ded8724c9511c5bbe745d28989262ae4447b1734 100644 (file)
--- a/tornado/http1connection.py
+++ b/tornado/http1connection.py
@@ -16,7 +16,6 @@
 
 from __future__ import absolute_import, division, print_function, with_statement
 
-import datetime
 import socket
 
 from tornado.concurrent import Future

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index b8339d961eb9d9b94ff02466d7c26b68cf2ac7a1..995ab7b104e0b6a42ee1c53512e809a93cf693e8 100644 (file)
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -28,8 +28,6 @@ class except to start a server at the beginning of the process
 
 from __future__ import absolute_import, division, print_function, with_statement
 
-import socket
-
 from tornado.http1connection import HTTP1Connection
 from tornado import httputil
 from tornado import netutil
@@ -138,7 +136,7 @@ class HTTPServer(TCPServer, httputil.HTTPServerConnectionDelegate):
                  xheaders=False, ssl_options=None, protocol=None, gzip=False,
                  chunk_size=None, max_header_size=None,
                  idle_connection_timeout=None, body_timeout=None,
-                 max_body_size=None, **kwargs):
+                 max_body_size=None, max_buffer_size=None):
         self.request_callback = request_callback
         self.no_keep_alive = no_keep_alive
         self.xheaders = xheaders
@@ -150,7 +148,7 @@ class HTTPServer(TCPServer, httputil.HTTPServerConnectionDelegate):
         self.body_timeout = body_timeout
         self.max_body_size = max_body_size
         TCPServer.__init__(self, io_loop=io_loop, ssl_options=ssl_options,
-                           **kwargs)
+                           max_buffer_size=max_buffer_size)
 
     def handle_stream(self, stream, address):
         conn = HTTP1Connection(