Skip to content

Commit 22a279e

Browse files
committed
Black is back
1 parent e1ba1a7 commit 22a279e

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

zulip/integrations/bridge_with_irc/irc-mirror.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
parser = zulip.add_default_arguments(
3030
argparse.ArgumentParser(usage=usage), allow_provisioning=True
3131
)
32-
parser.add_argument('--irc-server', default=None)
33-
parser.add_argument('--port', default=6697)
34-
parser.add_argument('--nick-prefix', default=None)
35-
parser.add_argument('--channel', default=None)
36-
parser.add_argument('--no-ssl', default=False)
37-
parser.add_argument('--stream', default="general")
38-
parser.add_argument('--topic', default="IRC")
39-
parser.add_argument('--nickserv-pw', default='')
32+
parser.add_argument("--irc-server", default=None)
33+
parser.add_argument("--port", default=6697)
34+
parser.add_argument("--nick-prefix", default=None)
35+
parser.add_argument("--channel", default=None)
36+
parser.add_argument("--no-ssl", default=False)
37+
parser.add_argument("--stream", default="general")
38+
parser.add_argument("--topic", default="IRC")
39+
parser.add_argument("--nickserv-pw", default="")
4040

4141
options = parser.parse_args()
4242
# Setting the client to irc_mirror is critical for this to work
@@ -68,6 +68,6 @@
6868
options.irc_server,
6969
options.nickserv_pw,
7070
options.port,
71-
use_ssl=not options.no_ssl
71+
use_ssl=not options.no_ssl,
7272
)
7373
bot.start()

zulip/integrations/bridge_with_irc/irc_mirror_backend.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import multiprocessing as mp
12
import ssl
3+
from typing import Any, Dict
4+
25
import irc.bot
36
import irc.connection
4-
import multiprocessing as mp
7+
from irc import schedule
58
from irc.client import Event, ServerConnection, ip_numstr_to_quad
69
from irc.client_aio import AioReactor
7-
from irc import schedule
8-
from typing import Any, Dict
910

1011

1112
class AioReactorWithScheduler(AioReactor):
@@ -32,7 +33,7 @@ def __init__(
3233
nickserv_password: str = "",
3334
port: int = 6667,
3435
use_ssl: bool = True,
35-
ssl_connection_factory: irc.connection.Factory = None
36+
ssl_connection_factory: irc.connection.Factory = None,
3637
) -> None:
3738
self.channel = channel # type: irc.bot.Channel
3839
self.zulip_client = zulip_client
@@ -47,17 +48,21 @@ def __init__(
4748
if ssl_connection_factory:
4849
self.connection_factory = ssl_connection_factory
4950
else:
50-
self.connection_factory = irc.connection.AioFactory(ssl=ssl.create_default_context())
51+
self.connection_factory = irc.connection.AioFactory(
52+
ssl=ssl.create_default_context()
53+
)
5154
else:
5255
self.connection_factory = irc.connection.AioFactory()
5356

5457
connect_params = {}
55-
connect_params['connect_factory'] = self.connection_factory
58+
connect_params["connect_factory"] = self.connection_factory
5659

5760
# Make sure the bot is subscribed to the stream
5861
self.check_subscription_or_die()
5962
# Initialize IRC bot after proper connection to Zulip server has been confirmed.
60-
irc.bot.SingleServerIRCBot.__init__(self, [irc.bot.ServerSpec(server, port)], nickname, nickname, **connect_params)
63+
irc.bot.SingleServerIRCBot.__init__(
64+
self, [irc.bot.ServerSpec(server, port)], nickname, nickname, **connect_params
65+
)
6166

6267
def zulip_sender(self, sender_string: str) -> str:
6368
nick = sender_string.split("!")[0]
@@ -67,7 +72,7 @@ def connect(self, *args: Any, **kwargs: Any) -> None:
6772
# Taken from
6873
# https://github.com/jaraco/irc/blob/main/irc/client_aio.py,
6974
# in particular the method of AioSimpleIRCClient
70-
kwargs['connect_factory'] = self.connection_factory
75+
kwargs["connect_factory"] = self.connection_factory
7176
self.c = self.reactor.loop.run_until_complete(self.connection.connect(*args, **kwargs))
7277
print("Listening now. Please send an IRC message to verify operation")
7378

0 commit comments

Comments
 (0)