api: Specify a default client of ZulipPython/version
(imported from commit 366d0e81a67f6a993fb0e9539d51e593c7863299)
This commit is contained in:
parent
df29a93a61
commit
de686fc83f
|
@ -45,6 +45,9 @@ requests_json_is_function = callable(requests.Response.json)
|
||||||
|
|
||||||
API_VERSTRING = "v1/"
|
API_VERSTRING = "v1/"
|
||||||
|
|
||||||
|
def _default_client():
|
||||||
|
return "ZulipPython/" + __version__
|
||||||
|
|
||||||
def generate_option_group(parser):
|
def generate_option_group(parser):
|
||||||
group = optparse.OptionGroup(parser, 'API configuration')
|
group = optparse.OptionGroup(parser, 'API configuration')
|
||||||
group.add_option('--site',
|
group.add_option('--site',
|
||||||
|
@ -63,7 +66,7 @@ def generate_option_group(parser):
|
||||||
help='Provide detailed output.')
|
help='Provide detailed output.')
|
||||||
group.add_option('--client',
|
group.add_option('--client',
|
||||||
action='store',
|
action='store',
|
||||||
default="API: Python",
|
default=_default_client(),
|
||||||
help=optparse.SUPPRESS_HELP)
|
help=optparse.SUPPRESS_HELP)
|
||||||
|
|
||||||
return group
|
return group
|
||||||
|
@ -75,7 +78,9 @@ def init_from_options(options):
|
||||||
class Client(object):
|
class Client(object):
|
||||||
def __init__(self, email=None, api_key=None, config_file=None,
|
def __init__(self, email=None, api_key=None, config_file=None,
|
||||||
verbose=False, retry_on_errors=True,
|
verbose=False, retry_on_errors=True,
|
||||||
site=None, client="API: Python"):
|
site=None, client=None):
|
||||||
|
if client is None:
|
||||||
|
client = _default_client()
|
||||||
if None in (api_key, email):
|
if None in (api_key, email):
|
||||||
if config_file is None:
|
if config_file is None:
|
||||||
config_file = os.path.join(os.environ["HOME"], ".zuliprc")
|
config_file = os.path.join(os.environ["HOME"], ".zuliprc")
|
||||||
|
|
Loading…
Reference in a new issue