From fa91b0ab7ce45389357a4fc9f33785514b265b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Braulio=20Valdivielso=20Mart=C3=ADnez?= Date: Thu, 3 Mar 2016 20:07:42 +0100 Subject: [PATCH] Fixed style --- test_requests.py | 11 ++--------- testserver/server.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/test_requests.py b/test_requests.py index f24c775c..ea57daae 100755 --- a/test_requests.py +++ b/test_requests.py @@ -1186,19 +1186,12 @@ class TestContentEncodingDetection(unittest.TestCase): block_server = threading.Event() server = Server.basic_response_server(wait_to_close_event=block_server) data = (i for i in [b'a', b'b', b'c']) - with server as (host, port): url = 'http://{}:{}/'.format(host, port) r = requests.post(url, data=data, stream=True) block_server.set() # release server block - - assert r.status_code == 200 - assert r.request.headers['Transfer-Encoding'] == 'chunked' - - - - - + assert r.status_code == 200 + assert r.request.headers['Transfer-Encoding'] == 'chunked' class TestCaseInsensitiveDict(unittest.TestCase): diff --git a/testserver/server.py b/testserver/server.py index c5a7ad5b..a1a3fd0f 100644 --- a/testserver/server.py +++ b/testserver/server.py @@ -5,20 +5,20 @@ import socket import select -def consume_socket_content(sock, chunks=65536, timeout=0.5): +def consume_socket_content(sock, timeout=0.5): + chunks = 65536 content = "" more_to_read = select.select([sock], [], [], timeout)[0] while more_to_read: new_content = sock.recv(chunks).decode("utf-8") - if len(new_content) == 0: - more_to_read = False # empty recv means the socket disconnected + if not new_content: + break - else: - content += new_content - # stop reading if no new data is received for a while - more_to_read = select.select([sock], [], [], timeout)[0] + content += new_content + # stop reading if no new data is received for a while + more_to_read = select.select([sock], [], [], timeout)[0] return content @@ -49,7 +49,6 @@ class Server(threading.Thread): server = Server(text_response_handler, **kwargs) - return server @classmethod @@ -58,7 +57,6 @@ class Server(threading.Thread): "HTTP/1.1 200 OK\r\n" + "Content-Length: 0\r\n\r\n", **kwargs ) - return server def run(self):