xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup: Move line breaks before binary operators.

Browse source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-04-18 17:33:01 -07:00 • committed by Tim Abbott
parent 6f40bcf745
commit 17cf26aa1f
12 changed files with 152 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zulip/integrations/jabber/jabber_mirror_backend.py
View file

@ -66,9 +66,11 @@ def jid_to_zulip(jid: JID) -> str:
def zulip_to_jid(email: str, jabber_domain: str) -> JID:
jid = JID(email, domain=jabber_domain)
if (options.zulip_email_suffix and
options.zulip_email_suffix in jid.username and
not jid.username.endswith("-bot")):
if (
options.zulip_email_suffix
and options.zulip_email_suffix in jid.username
and not jid.username.endswith("-bot")
):
jid.username = jid.username.rpartition(options.zulip_email_suffix)[0]
return jid
@ -393,8 +395,10 @@ option does not affect login credentials.'''.replace("\n", " "))
pass
for option in ("jid", "jabber_password", "conference_domain", "mode", "zulip_email_suffix",
"jabber_server_address", "jabber_server_port"):
if (getattr(options, option) is None and
config.has_option("jabber_mirror", option)):
if (
getattr(options, option) is None
and config.has_option("jabber_mirror", option)
):
setattr(options, option, config.get("jabber_mirror", option))
for option in ("no_use_tls",):