From 5405f61ee747ccded7c2e9abfaeddcd581c9c8ca Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Thu, 10 Nov 2022 20:50:18 +0100 Subject: [PATCH] Remove unused `handle_no_connect` on `wsproto` --- setup.cfg | 2 +- uvicorn/protocols/websockets/wsproto_impl.py | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5b092698ca..e6a1b432db 100644 --- a/setup.cfg +++ b/setup.cfg @@ -82,7 +82,7 @@ plugins = [coverage:report] precision = 2 -fail_under = 98.28 +fail_under = 98.50 show_missing = true skip_covered = true exclude_lines = diff --git a/uvicorn/protocols/websockets/wsproto_impl.py b/uvicorn/protocols/websockets/wsproto_impl.py index a97766ff56..fbb5fda09b 100644 --- a/uvicorn/protocols/websockets/wsproto_impl.py +++ b/uvicorn/protocols/websockets/wsproto_impl.py @@ -87,6 +87,7 @@ def data_received(self, data): try: self.conn.receive_data(data) except RemoteProtocolError as err: + print(err, type(err)) self.transport.write(self.conn.send(err.event_hint)) self.transport.close() else: @@ -100,10 +101,6 @@ def handle_events(self): self.handle_text(event) elif isinstance(event, events.BytesMessage): self.handle_bytes(event) - elif isinstance(event, events.RejectConnection): - self.handle_no_connect(event) - elif isinstance(event, events.RejectData): - self.handle_no_connect(event) elif isinstance(event, events.CloseConnection): self.handle_close(event) elif isinstance(event, events.Ping): @@ -159,20 +156,6 @@ def handle_connect(self, event): task.add_done_callback(self.on_task_complete) self.tasks.add(task) - def handle_no_connect(self, event): - headers = [ - (b"content-type", b"text/plain; charset=utf-8"), - (b"connection", b"close"), - ] - msg = h11.Response(status_code=400, headers=headers, reason="Bad Request") - output = self.conn.send(msg) - msg = h11.Data(data=event.reason.encode("utf-8")) - output += self.conn.send(msg) - msg = h11.EndOfMessage() - output += self.conn.send(msg) - self.transport.write(output) - self.transport.close() - def handle_text(self, event): self.text += event.data if event.message_finished: