pep8: Fix E128 violations.

With some line-wrapping tweaks by tabbott.
This commit is contained in:
reallyly 2016-12-11 13:30:45 +00:00 committed by Tim Abbott
parent 92981590f5
commit 9d6e7cfea5
8 changed files with 49 additions and 48 deletions

View file

@ -322,28 +322,28 @@ def config_error(msg):
sys.exit(2) sys.exit(2)
if __name__ == '__main__': if __name__ == '__main__':
parser = optparse.OptionParser(epilog= parser = optparse.OptionParser(
'''Most general and Jabber configuration options may also be specified in the epilog='''Most general and Jabber configuration options may also be specified in the
zulip configuration file under the jabber_mirror section (exceptions are noted zulip configuration file under the jabber_mirror section (exceptions are noted
in their help sections). Keys have the same name as options with hyphens in their help sections). Keys have the same name as options with hyphens
replaced with underscores. Zulip configuration options go in the api section, replaced with underscores. Zulip configuration options go in the api section,
as normal.'''.replace("\n", " ") as normal.'''.replace("\n", " ")
) )
parser.add_option('--mode', parser.add_option(
'--mode',
default=None, default=None,
action='store', action='store',
help= help='''Which mode to run in. Valid options are "personal" and "public". In
'''Which mode to run in. Valid options are "personal" and "public". In
"personal" mode, the mirror uses an individual users' credentials and mirrors "personal" mode, the mirror uses an individual users' credentials and mirrors
all messages they send on Zulip to Jabber and all private Jabber messages to all messages they send on Zulip to Jabber and all private Jabber messages to
Zulip. In "public" mode, the mirror uses the credentials for a dedicated mirror Zulip. In "public" mode, the mirror uses the credentials for a dedicated mirror
user and mirrors messages sent to Jabber rooms to Zulip. Defaults to user and mirrors messages sent to Jabber rooms to Zulip. Defaults to
"personal"'''.replace("\n", " ")) "personal"'''.replace("\n", " "))
parser.add_option('--zulip-email-suffix', parser.add_option(
'--zulip-email-suffix',
default=None, default=None,
action='store', action='store',
help= help='''Add the specified suffix to the local part of email addresses constructed
'''Add the specified suffix to the local part of email addresses constructed
from JIDs and nicks before sending requests to the Zulip server, and remove the from JIDs and nicks before sending requests to the Zulip server, and remove the
suffix before sending requests to the Jabber server. For example, specifying suffix before sending requests to the Jabber server. For example, specifying
"+foo" will cause messages that are sent to the "bar" room by nickname "qux" to "+foo" will cause messages that are sent to the "bar" room by nickname "qux" to
@ -357,7 +357,8 @@ option does not affect login credentials.'''.replace("\n", " "))
default=logging.INFO) default=logging.INFO)
jabber_group = optparse.OptionGroup(parser, "Jabber configuration") jabber_group = optparse.OptionGroup(parser, "Jabber configuration")
jabber_group.add_option('--jid', jabber_group.add_option(
'--jid',
default=None, default=None,
action='store', action='store',
help="Your Jabber JID. If a resource is specified, " help="Your Jabber JID. If a resource is specified, "