From de1432aedc27cf5ed04be762fd5e21b04f63ec85 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Mon, 3 Mar 2014 00:51:33 -0500 Subject: [PATCH] api: Expose function for getting the default Zulip config file (imported from commit 89d6b48f9393670429aa960ad0ff27f030166e34) --- zulip/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zulip/__init__.py b/zulip/__init__.py index 4be0921..ce71ef3 100644 --- a/zulip/__init__.py +++ b/zulip/__init__.py @@ -84,6 +84,13 @@ def init_from_options(options, client=None): config_file=options.zulip_config_file, verbose=options.verbose, 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): def __init__(self, email=None, api_key=None, config_file=None, verbose=False, retry_on_errors=True, @@ -92,10 +99,7 @@ class Client(object): client = _default_client() if None in (api_key, email): if config_file is None: - 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") + config_file = get_default_config_filename() if not os.path.exists(config_file): raise RuntimeError("api_key or email not specified and %s does not exist" % (config_file,))