Skip to content

Commit 77635e4

Browse files
committed
flake8 cleanup
1 parent a791837 commit 77635e4

File tree

5 files changed

+19
-27
lines changed

5 files changed

+19
-27
lines changed

examples/bugs/issue_290/client.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
import asyncio
22
import logging
3-
import sys
43
from asyncio import Event
54
from typing import AsyncGenerator, Tuple
65

7-
import aiohttp
8-
from rsocket.transports.asyncwebsockets_transport import websocket_client
9-
10-
from rsocket.transports.aiohttp_websocket import TransportAioHttpClient
11-
126
from reactivestreams.publisher import Publisher
137
from reactivestreams.subscriber import Subscriber
148
from reactivestreams.subscription import Subscription
159
from rsocket.extensions.helpers import route, composite, authenticate_simple
1610
from rsocket.extensions.mimetypes import WellKnownMimeTypes
17-
from rsocket.helpers import single_transport_provider
1811
from rsocket.payload import Payload
1912
from rsocket.rsocket_client import RSocketClient
2013
from rsocket.streams.stream_from_async_generator import StreamFromAsyncGenerator
21-
from rsocket.transports.tcp import TransportTCP
14+
from rsocket.transports.asyncwebsockets_transport import websocket_client
2215

2316

2417
def sample_publisher(wait_for_requester_complete: Event,
@@ -64,8 +57,8 @@ def on_complete(self):
6457
logging.info('Completed from server on channel')
6558
self._wait_for_responder_complete.set()
6659

67-
async def request_channel(client: RSocketClient):
6860

61+
async def request_channel(client: RSocketClient):
6962
channel_completion_event = Event()
7063
requester_completion_event = Event()
7164
payload = Payload(b'The first item in the stream', composite(
@@ -84,9 +77,9 @@ async def request_channel(client: RSocketClient):
8477

8578

8679
async def application(serve_port: int):
87-
async with websocket_client('http://localhost:%s/rsocket' % serve_port,
88-
metadata_encoding=WellKnownMimeTypes.MESSAGE_RSOCKET_COMPOSITE_METADATA,) as client:
89-
await request_channel(client)
80+
async with websocket_client('http://localhost:%s/rsocket' % serve_port,
81+
metadata_encoding=WellKnownMimeTypes.MESSAGE_RSOCKET_COMPOSITE_METADATA, ) as client:
82+
await request_channel(client)
9083

9184

9285
async def command():
@@ -95,4 +88,4 @@ async def command():
9588

9689

9790
if __name__ == '__main__':
98-
asyncio.run(command())
91+
asyncio.run(command())

examples/bugs/issue_290/server.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def publish(self, data):
2222
print(f"ChannelPublisher - publish: {data}")
2323
print(f"ChannelPublisher - publish subscriber: {self.subscriber}")
2424

25-
if (self.subscriber is not None):
25+
if self.subscriber is not None:
2626
self.subscriber.on_next(Payload(data.encode('utf-8')))
2727

2828
def subscribe(self, subscriber):
@@ -36,6 +36,7 @@ def subscribe(self, subscriber):
3636
class ChannelSubscriber(DefaultSubscriber):
3737

3838
def __init__(self, publisher: ChannelPublisher):
39+
super().__init__()
3940
self.subscription = None
4041
self.publisher = publisher
4142

@@ -106,4 +107,4 @@ async def start_server():
106107

107108

108109
if __name__ == '__main__':
109-
asyncio.run(start_server())
110+
asyncio.run(start_server())

examples/django_channels/client_example.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ async def connect_to_django_channels(url: str, ssl_context: Optional[ssl.SSLCont
2929
async with websockets.connect(url, ssl=ssl_context) as websocket:
3030
# Create a transport using the websocket connection
3131
transport = WebsocketsTransport()
32-
32+
3333
# Start the transport handler
3434
handler_task = asyncio.create_task(transport.handler(websocket))
35-
35+
3636
try:
3737
# Create an RSocket client using the transport
3838
async with RSocketClient(single_transport_provider(transport)) as client:
3939
# Send a request-response
4040
payload = Payload(b'Hello from RSocket client')
4141
response = await client.request_response(payload)
42-
42+
4343
print(f"Received response: {response.data.decode()}")
44-
44+
4545
# You can add more interactions here
46-
46+
4747
finally:
4848
# Clean up the handler task
4949
handler_task.cancel()
@@ -61,7 +61,7 @@ async def main(url: str, secure: bool):
6161
Connect to a Django Channels RSocket server.
6262
"""
6363
logging.basicConfig(level=logging.INFO)
64-
64+
6565
if secure and not url.startswith('wss://'):
6666
url = 'wss://' + url.removeprefix('ws://')
6767
ssl_context = ssl.create_default_context()
@@ -70,9 +70,9 @@ async def main(url: str, secure: bool):
7070
ssl_context.verify_mode = ssl.CERT_NONE
7171
else:
7272
ssl_context = None
73-
73+
7474
await connect_to_django_channels(url, ssl_context)
7575

7676

7777
if __name__ == '__main__':
78-
main()
78+
main()

examples/django_channels/server_example.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ async def request_response(self, payload: Payload):
3232
# Create a consumer using the factory
3333
RSocketConsumer = rsocket_consumer_factory(handler_factory=Handler)
3434

35-
3635
# Django Channels routing configuration
3736
application = ProtocolTypeRouter({
3837
'websocket': URLRouter([
3938
path('rsocket', RSocketConsumer.as_asgi()),
4039
]),
4140
})
4241

43-
4442
"""
4543
To use this in a Django project:
4644
$ python3 -c 'import channels; import daphne; print(channels.__version__, daphne.__version__)'
@@ -76,4 +74,4 @@ async def request_response(self, payload: Payload):
7674
websocket_urlpatterns = [
7775
path('rsocket', RSocketConsumer.as_asgi()),
7876
]
79-
"""
77+
"""

tests/rsocket/test_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
MetadataPushFrame, PayloadFrame, LeaseFrame, ResumeOKFrame, KeepAliveFrame,
1212
serialize_with_frame_size_header, RequestStreamFrame, RequestChannelFrame, ParseError,
1313
parse_or_ignore, Frame, RequestFireAndForgetFrame, serialize_prefix_with_frame_size_header,
14-
parse_header_native, Header, is_frame_to_ignore, is_fragmentable_frame, new_frame_fragment)
14+
parse_header_native, Header, is_frame_to_ignore, is_fragmentable_frame)
1515
from rsocket.frame_parser import FrameParser
1616
from tests.rsocket.helpers import data_bits, build_frame, bits
1717

0 commit comments

Comments
 (0)