@@ -425,11 +425,11 @@ def config_error(msg: str) -> None:
425
425
"in the Zulip configuration file or on the commandline"
426
426
)
427
427
428
- zulipToJabber = ZulipToJabberBot (
428
+ zulip_to_jabber = ZulipToJabberBot (
429
429
zulip .init_from_options (options , "JabberMirror/" + __version__ )
430
430
)
431
431
# This won't work for open realms that don't have a consistent domain
432
- options .zulip_domain = zulipToJabber .client .email .partition ("@" )[- 1 ]
432
+ options .zulip_domain = zulip_to_jabber .client .email .partition ("@" )[- 1 ]
433
433
434
434
try :
435
435
jid = JID (options .jid )
@@ -439,7 +439,7 @@ def config_error(msg: str) -> None:
439
439
if options .conference_domain is None :
440
440
options .conference_domain = f"conference.{ jid .domain } "
441
441
442
- xmpp = JabberToZulipBot (jid , options .jabber_password , get_rooms (zulipToJabber ))
442
+ xmpp = JabberToZulipBot (jid , options .jabber_password , get_rooms (zulip_to_jabber ))
443
443
444
444
address = None
445
445
if options .jabber_server_address :
@@ -448,16 +448,16 @@ def config_error(msg: str) -> None:
448
448
if not xmpp .connect (use_tls = not options .no_use_tls , address = address ):
449
449
sys .exit ("Unable to connect to Jabber server" )
450
450
451
- xmpp .set_zulip_client (zulipToJabber )
452
- zulipToJabber .set_jabber_client (xmpp )
451
+ xmpp .set_zulip_client (zulip_to_jabber )
452
+ zulip_to_jabber .set_jabber_client (xmpp )
453
453
454
454
xmpp .process (block = False )
455
455
event_types = ["stream" ] if options .mode == "public" else ["message" , "subscription" ]
456
456
457
457
try :
458
458
logging .info ("Connecting to Zulip." )
459
- zulipToJabber .client .call_on_each_event (
460
- zulipToJabber .process_event , event_types = event_types
459
+ zulip_to_jabber .client .call_on_each_event (
460
+ zulip_to_jabber .process_event , event_types = event_types
461
461
)
462
462
except BaseException :
463
463
logging .exception ("Exception in main loop" )
0 commit comments