api: Expose function for getting the default Zulip config file

(imported from commit 89d6b48f9393670429aa960ad0ff27f030166e34)
This commit is contained in:
Zev Benjamin 2014-03-03 00:51:33 -05:00
parent dfed7f0b7e
commit 4fbe78d037
1 changed files with 8 additions and 4 deletions

View File

@ -84,6 +84,13 @@ def init_from_options(options, client=None):
config_file=options.zulip_config_file, verbose=options.verbose, config_file=options.zulip_config_file, verbose=options.verbose,
site=options.zulip_site, client=client) site=options.zulip_site, client=client)
def get_default_config_filename():
config_file = os.path.join(os.environ["HOME"], ".zuliprc")
if (not os.path.exists(config_file) and
os.path.exists(os.path.join(os.environ["HOME"], ".humbugrc"))):
raise RuntimeError("The Zulip API configuration file is now ~/.zuliprc; please run:\n\n mv ~/.humbugrc ~/.zuliprc\n")
return config_file
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,
@ -92,10 +99,7 @@ class Client(object):
client = _default_client() 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 = get_default_config_filename()
if (not os.path.exists(config_file) and
os.path.exists(os.path.join(os.environ["HOME"], ".humbugrc"))):
raise RuntimeError("The Zulip API configuration file is now ~/.zuliprc; please run:\n\n mv ~/.humbugrc ~/.zuliprc\n")
if not os.path.exists(config_file): if not os.path.exists(config_file):
raise RuntimeError("api_key or email not specified and %s does not exist" raise RuntimeError("api_key or email not specified and %s does not exist"
% (config_file,)) % (config_file,))