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

api: Let users of init_from_options specify a default client.

Browse source 
This way command-line scripts that use our `optparse` populator can
still specify a custom client without munging their `parser` object.

(imported from commit df8d28a46a4d4574523b106030dbfed2d9ac931e)
This commit is contained in:
Luke Faraone 2013-12-06 17:34:20 -05:00
parent de686fc83f
commit edf6166898
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zulip/__init__.py
View file

@ -66,14 +66,18 @@ def generate_option_group(parser):
help='Provide detailed output.')
group.add_option('--client',
action='store',
default=_default_client(),
default=None,
help=optparse.SUPPRESS_HELP)
return group
def init_from_options(options):
return Client(email=options.email, api_key=options.api_key, config_file=options.config_file,
verbose=options.verbose, site=options.site, client=options.client)
def init_from_options(options, client=None):
if options.client is not None:
client = options.client
elif client is None:
client = _default_client()
return Client(email=options.email, api_key=options.api_key,
config_file=options.config_file, verbose=options.verbose,
site=options.site, client=client)
class Client(object):
def __init__(self, email=None, api_key=None, config_file=None,