From: Ben Darnell Date: Sun, 20 Apr 2014 14:22:32 +0000 (-0400) Subject: Remove HTTPServer.__init__'s **kwargs. X-Git-Tag: v4.0.0b1~91^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adba10d66724d601b0cced11e14e70a2a661fa09;p=thirdparty%2Ftornado.git 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 44480f604..ded8724c9 100644 --- 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 b8339d961..995ab7b10 100644 --- 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(