Deduplicate include_body and allow_http10.

The use case for these parameters is the same.

Author: aaugustin

src/websockets/asyncio/client.py

@@ -754,8 +754,7 @@ def __init__(
  self.reader.read_line,
  self.reader.read_exact,
  self.reader.read_to_eof,
- include_body=False,
- allow_http10=True,
+ proxy=True,
  )
 
  loop = asyncio.get_running_loop()

src/websockets/http11.py

@@ -213,8 +213,7 @@ def parse(
  read_line: Callable[[int], Generator[None, None, bytes]],
  read_exact: Callable[[int], Generator[None, None, bytes]],
  read_to_eof: Callable[[int], Generator[None, None, bytes]],
- include_body: bool = True,
- allow_http10: bool = False,
+ proxy: bool = False,
  ) -> Generator[None, None, Response]:
  """
  Parse a WebSocket handshake response.
@@ -250,7 +249,7 @@ def parse(
  protocol, raw_status_code, raw_reason = status_line.split(b" ", 2)
  except ValueError: # not enough values to unpack (expected 3, got 1-2)
  raise ValueError(f"invalid HTTP status line: {d(status_line)}") from None
- if allow_http10: # some proxies still use HTTP/1.0
+ if proxy: # some proxies still use HTTP/1.0
  if protocol not in [b"HTTP/1.1", b"HTTP/1.0"]:
  raise ValueError(
  f"unsupported protocol; expected HTTP/1.1 or HTTP/1.0: "
@@ -277,12 +276,12 @@ def parse(
 
  headers = yield from parse_headers(read_line)
 
- if include_body:
+ if proxy:
+ body = b""
+ else:
  body = yield from read_body(
  status_code, headers, read_line, read_exact, read_to_eof
  )
- else:
- body = b""
 
  return cls(status_code, reason, headers, body)
 

src/websockets/sync/client.py

@@ -498,8 +498,7 @@ def read_connect_response(sock: socket.socket, deadline: Deadline) -> Response:
  reader.read_line,
  reader.read_exact,
  reader.read_to_eof,
- include_body=False,
- allow_http10=True,
+ proxy=True,
  )
  try:
  while True:

tests/test_http11.py

@@ -328,22 +328,22 @@ def test_parse_body_not_modified(self):
  response = self.assertGeneratorReturns(self.parse())
  self.assertEqual(response.body, b"")
 
- def test_parse_without_body(self):
+ def test_parse_proxy_response_does_not_read_body(self):
  self.reader.feed_data(b"HTTP/1.1 200 Connection Established\r\n\r\n")
- response = self.assertGeneratorReturns(self.parse(include_body=False))
+ response = self.assertGeneratorReturns(self.parse(proxy=True))
  self.assertEqual(response.body, b"")
 
- def test_parse_http10(self):
+ def test_parse_proxy_http10(self):
  self.reader.feed_data(b"HTTP/1.0 200 OK\r\nContent-Length: 0\r\n\r\n")
- response = self.assertGeneratorReturns(self.parse(allow_http10=True))
+ response = self.assertGeneratorReturns(self.parse(proxy=True))
  self.assertEqual(response.status_code, 200)
  self.assertEqual(response.reason_phrase, "OK")
  self.assertEqual(response.body, b"")
 
- def test_parse_http10_unsupported_protocol(self):
+ def test_parse_proxy_unsupported_protocol(self):
  self.reader.feed_data(b"HTTP/1.2 400 Bad Request\r\n\r\n")
  with self.assertRaises(ValueError) as raised:
- next(self.parse(allow_http10=True))
+ next(self.parse(proxy=True))
  self.assertEqual(
  str(raised.exception),
  "unsupported protocol; expected HTTP/1.1 or HTTP/1.0: "