Upgrade the code to more recent Python versions

Author: miguelgrinberg

examples/client/async/latency_client.py

@@ -23,7 +23,7 @@ async def connect():
 async def pong_from_server():
     global start_timer
     latency = time.time() - start_timer
-    print('latency is {0:.2f} ms'.format(latency * 1000))
+    print(f'latency is {latency * 1000:.2f} ms')
     await sio.sleep(1)
     if sio.connected:
         await send_ping()

examples/client/sync/latency_client.py

@@ -21,7 +21,7 @@ def connect():
 def pong_from_server():
     global start_timer
     latency = time.time() - start_timer
-    print('latency is {0:.2f} ms'.format(latency * 1000))
+    print(f'latency is {latency * 1000:.2f} ms')
     sio.sleep(1)
     if sio.connected:
         send_ping()

examples/simple-client/async/latency_client.py

@@ -12,7 +12,7 @@ async def main():
             while (await sio.receive()) != ['pong_from_server']:
                 pass
             latency = time.time() - start_timer
-            print('latency is {0:.2f} ms'.format(latency * 1000))
+            print(f'latency is {latency * 1000:.2f} ms')
 
             await asyncio.sleep(1)
 

examples/simple-client/sync/latency_client.py

@@ -11,7 +11,7 @@ def main():
             while sio.receive() != ['pong_from_server']:
                 pass
             latency = time.time() - start_timer
-            print('latency is {0:.2f} ms'.format(latency * 1000))
+            print(f'latency is {latency * 1000:.2f} ms')
 
             time.sleep(1)
 

src/socketio/admin.py

@@ -16,7 +16,7 @@ def __init__(self):
 
     def push(self, type, count=1):
         timestamp = int(time.time()) * 1000
-        key = '{};{}'.format(timestamp, type)
+        key = f'{timestamp};{type}'
         if key not in self.buffer:
             self.buffer[key] = {
                 'timestamp': timestamp,

src/socketio/async_client.py

@@ -386,7 +386,7 @@ async def _send_packet(self, pkt):
     async def _handle_connect(self, namespace, data):
         namespace = namespace or '/'
         if namespace not in self.namespaces:
-            self.logger.info('Namespace {} is connected'.format(namespace))
+            self.logger.info(f'Namespace {namespace} is connected')
             self.namespaces[namespace] = (data or {}).get('sid', self.sid)
             await self._trigger_event('connect', namespace=namespace)
             self._connect_event.set()

src/socketio/async_server.py

@@ -385,7 +385,7 @@ def on_message(sid, msg):
                 async with eio.session(sid) as session:
                     print('received message from ', session['username'])
         """
-        class _session_context_manager(object):
+        class _session_context_manager:
             def __init__(self, server, sid, namespace):
                 self.server = server
                 self.sid = sid

src/socketio/base_manager.py

@@ -37,8 +37,7 @@ def get_participants(self, namespace, room):
                 participants.update(ns[r]._fwdm if r in ns else {})
         else:
             participants = ns[room]._fwdm.copy() if room in ns else {}
-        for sid, eio_sid in participants.items():
-            yield sid, eio_sid
+        yield from participants.items()
 
     def connect(self, eio_sid, namespace):
         """Register a client connection to a namespace."""

src/socketio/base_namespace.py

@@ -1,4 +1,4 @@
-class BaseNamespace(object):
+class BaseNamespace:
     def __init__(self, namespace=None):
         self.namespace = namespace or '/'
 

src/socketio/client.py

@@ -363,7 +363,7 @@ def _send_packet(self, pkt):
     def _handle_connect(self, namespace, data):
         namespace = namespace or '/'
         if namespace not in self.namespaces:
-            self.logger.info('Namespace {} is connected'.format(namespace))
+            self.logger.info(f'Namespace {namespace} is connected')
             self.namespaces[namespace] = (data or {}).get('sid', self.sid)
             self._trigger_event('connect', namespace=namespace)
             self._connect_event.set()