Merge branch 'master' of github.com:KeepSafe/aiohttp

aio-libs · Jan 4, 2015 · d2fbdef · d2fbdef
2 parents 2221c10 + 27fcbde
commit d2fbdef
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/aiohttp/web.py b/aiohttp/web.py
@@ -139,8 +139,7 @@ def content_length(self):
 
 class Request(HeadersMixin):
 
-    def __init__(self, app, message, payload, transport, reader, writer,
-                 keep_alive_timeout):
+    def __init__(self, app, message, payload, transport, reader, writer):
         self._app = app
         self._version = message.version
         self._transport = transport
@@ -162,7 +161,7 @@ def __init__(self, app, message, payload, transport, reader, writer,
         elif message.should_close:
             self._keep_alive = False
         else:
-            self._keep_alive = bool(keep_alive_timeout)
+            self._keep_alive = True
 
         # matchdict, route_name, handler
         # or information about traversal lookup
@@ -1340,8 +1339,7 @@ def handle_request(self, message, payload):
 
         app = self._app
         request = Request(app, message, payload,
-                          self.transport, self.reader, self.writer,
-                          self.keep_alive_timeout)
+                          self.transport, self.reader, self.writer)
         try:
             match_info = yield from self._router.resolve(request)
 

diff --git a/tests/test_urldispatch.py b/tests/test_urldispatch.py
@@ -28,7 +28,7 @@ def make_request(self, method, path):
         self.reader = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer, 15)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_add_route_root(self):

diff --git a/tests/test_web_exceptions.py b/tests/test_web_exceptions.py
@@ -35,7 +35,7 @@ def make_request(self, method='GET', path='/', headers=MultiDict()):
         message = RawRequestMessage(method, path, HttpVersion11, headers,
                                     False, False)
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer, 15)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_all_http_exceptions_exported(self):

diff --git a/tests/test_web_request.py b/tests/test_web_request.py
@@ -17,8 +17,7 @@ def tearDown(self):
         self.loop.close()
 
     def make_request(self, method, path, headers=MultiDict(), *,
-                     version=HttpVersion(1, 1), closing=False,
-                     keep_alive_timeout=15):
+                     version=HttpVersion(1, 1), closing=False):
         self.app = mock.Mock()
         message = RawRequestMessage(method, path, version, headers, closing,
                                     False)
@@ -27,8 +26,7 @@ def make_request(self, method, path, headers=MultiDict(), *,
         self.writer = mock.Mock()
         self.reader = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer,
-                      keep_alive_timeout)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_ctor(self):
@@ -109,10 +107,6 @@ def test_non_keepalive_on_closing(self):
         req = self.make_request('GET', '/', closing=True)
         self.assertFalse(req.keep_alive)
 
-    def test_non_keepalive_on_server_protocol_without_keepalive_timeout(self):
-        req = self.make_request('GET', '/', closing=True, keep_alive_timeout=0)
-        self.assertFalse(req.keep_alive)
-
     def test_call_POST_on_GET_request(self):
         req = self.make_request('GET', '/')
 

diff --git a/tests/test_web_response.py b/tests/test_web_response.py
@@ -24,7 +24,7 @@ def make_request(self, method, path, headers=MultiDict()):
         self.reader = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer, 15)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_ctor(self):
@@ -280,7 +280,7 @@ def make_request(self, method, path, headers=MultiDict()):
         self.reader = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer, 15)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_ctor(self):

diff --git a/tests/test_web_websocket.py b/tests/test_web_websocket.py
@@ -35,7 +35,7 @@ def make_request(self, method, path, headers=None):
         self.reader = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer, 15)
+                      self.transport, self.reader, self.writer)
         return req
 
     def test_nonstarted_ping(self):