Run pyupgrade --py36-plus

Author: bluetech

compliance/run-autobahn-tests.py

@@ -20,7 +20,7 @@
     "servers": [
         {
             "agent": "wsproto",
-            "url": "ws://localhost:{}".format(PORT),
+            "url": f"ws://localhost:{PORT}",
             "options": {"version": 18},
         }
     ],
@@ -30,7 +30,7 @@
 }
 
 SERVER_CONFIG = {
-    "url": "ws://localhost:{}".format(PORT),
+    "url": f"ws://localhost:{PORT}",
     "options": {"failByDrop": False},
     "outdir": "./reports/clients",
     "webport": 8080,
@@ -43,7 +43,7 @@
     "all": ["*"],
     "fast": [
         # The core functionality tests
-        *["{}.*".format(i) for i in range(1, 12)],
+        *[f"{i}.*" for i in range(1, 12)],
         # Compression tests -- in each section, the tests get progressively
         # slower until they're taking 10s of seconds apiece. And it's
         # mostly stress tests, without much extra coverage to show for
@@ -82,7 +82,7 @@ def wait_for_listener(port: int) -> None:
         sock = socket.socket()
         try:
             sock.connect(("localhost", port))
-        except socket.error as exc:
+        except OSError as exc:
             if exc.errno == errno.ECONNREFUSED:
                 time.sleep(0.01)
             else:
@@ -240,9 +240,7 @@ def main() -> None:
         say("Unrecognized mode, try 'client' or 'server'")
         sys.exit(2)
 
-    say(
-        "in {} mode: failed {} out of {} total".format(args.MODE.upper(), failed, total)
-    )
+    say(f"in {args.MODE.upper()} mode: failed {failed} out of {total} total")
 
     if failed:
         say("Test failed")

compliance/test_client.py

@@ -63,7 +63,7 @@ def run_case(server: str, case: int, agent: str) -> None:
         connection.send(
             Request(
                 host=uri.netloc,
-                target="%s?%s" % (uri.path, uri.query),
+                target=f"{uri.path}?{uri.query}",
                 extensions=[PerMessageDeflate()],
             )
         )
@@ -105,9 +105,7 @@ def update_reports(server: str, agent: str) -> None:
     sock.connect((uri.hostname, uri.port or 80))
 
     sock.sendall(
-        connection.send(
-            Request(host=uri.netloc, target="%s?%s" % (uri.path, uri.query))
-        )
+        connection.send(Request(host=uri.netloc, target=f"{uri.path}?{uri.query}"))
     )
     closed = False
 

compliance/test_server.py

@@ -12,14 +12,14 @@
 
 def new_conn(sock: socket.socket) -> None:
     global count
-    print("test_server.py received connection {}".format(count))
+    print(f"test_server.py received connection {count}")
     count += 1
     ws = WSConnection(SERVER)
     closed = False
     while not closed:
         try:
             data: Optional[bytes] = sock.recv(65535)
-        except socket.error:
+        except OSError:
             data = None
 
         ws.receive_data(data or None)
@@ -46,7 +46,7 @@ def new_conn(sock: socket.socket) -> None:
 
         try:
             sock.sendall(outgoing_data)
-        except socket.error:
+        except OSError:
             closed = True
 
     sock.close()

example/synchronous_client.py

@@ -49,7 +49,7 @@ def wsproto_demo(host: str, port: int) -> None:
     """
 
     # 0) Open TCP connection
-    print("Connecting to {}:{}".format(host, port))
+    print(f"Connecting to {host}:{port}")
     conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     conn.connect((host, port))
 
@@ -64,14 +64,14 @@ def wsproto_demo(host: str, port: int) -> None:
 
     # 2) Send a message and display response
     message = "wsproto is great"
-    print("Sending message: {}".format(message))
+    print(f"Sending message: {message}")
     net_send(ws.send(Message(data=message)), conn)
     net_recv(ws, conn)
     handle_events(ws)
 
     # 3) Send ping and display pong
     payload = b"table tennis"
-    print("Sending ping: {!r}".format(payload))
+    print(f"Sending ping: {payload!r}")
     net_send(ws.send(Ping(payload=payload)), conn)
     net_recv(ws, conn)
     handle_events(ws)
@@ -111,9 +111,9 @@ def handle_events(ws: WSConnection) -> None:
         if isinstance(event, AcceptConnection):
             print("WebSocket negotiation complete")
         elif isinstance(event, TextMessage):
-            print("Received message: {}".format(event.data))
+            print(f"Received message: {event.data}")
         elif isinstance(event, Pong):
-            print("Received pong: {!r}".format(event.payload))
+            print(f"Received pong: {event.payload!r}")
         else:
             raise Exception("Do not know how to handle event: " + str(event))
 

example/synchronous_server.py

@@ -97,7 +97,7 @@ def handle_connection(stream: socket.socket) -> None:
                 print("Received ping and sending pong")
                 out_data += ws.send(event.response())
             else:
-                print("Unknown event: {!r}".format(event))
+                print(f"Unknown event: {event!r}")
 
         # 4) Send data from wsproto to network
         print("Sending {} bytes".format(len(out_data)))

src/wsproto/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 wsproto
 ~~~~~~~
@@ -86,11 +85,9 @@ def events(self) -> Generator[Event, None, None]:
         Each event is an instance of a subclass of
         :class:`wsproto.events.Event`.
         """
-        for event in self.handshake.events():
-            yield event
+        yield from self.handshake.events()
         if self.connection is not None:
-            for event in self.connection.events():
-                yield event
+            yield from self.connection.events()
 
 
 __all__ = ("ConnectionType", "WSConnection")

src/wsproto/connection.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 wsproto/connection
 ~~~~~~~~~~~~~~~~~~
@@ -106,7 +105,7 @@ def send(self, event: Event) -> bytes:
             else:
                 self._state = ConnectionState.LOCAL_CLOSING
         else:
-            raise LocalProtocolError("Event {} cannot be sent.".format(event))
+            raise LocalProtocolError(f"Event {event} cannot be sent.")
         return data
 
     def receive_data(self, data: Optional[bytes]) -> None:

src/wsproto/events.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 wsproto/events
 ~~~~~~~~~~~~~~

src/wsproto/extensions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 wsproto/extensions
 ~~~~~~~~~~~~~~~~~~
@@ -306,7 +305,7 @@ def __repr__(self) -> str:
         if self.server_no_context_takeover:
             descr.append("server_no_context_takeover")
 
-        return "<%s %s>" % (self.__class__.__name__, "; ".join(descr))
+        return "<{} {}>".format(self.__class__.__name__, "; ".join(descr))
 
 
 #: SUPPORTED_EXTENSIONS maps all supported extension names to their class.

src/wsproto/frame_protocol.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 wsproto/frame_protocol
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -410,7 +409,7 @@ def parse_header(self) -> bool:
         try:
             opcode = Opcode(opcode)
         except ValueError:
-            raise ParseFailed("Invalid opcode {:#x}".format(opcode))
+            raise ParseFailed(f"Invalid opcode {opcode:#x}")
 
         if opcode.iscontrol() and not fin:
             raise ParseFailed("Invalid attempt to fragment control frame")