diff --git a/setup.py b/setup.py index 4609b52..a081f2e 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ long_description=open('README.rst', 'r', encoding="utf-8").read(), author_email='agonzales@twitter.com', license='MIT', - version='1.4.0', + version='1.5.0', python_requires='>=3.3', install_requires=["requests", "tweet_parser", "pyyaml"], packages=find_packages(), diff --git a/tools/search_tweets.py b/tools/search_tweets.py index 7f8d9bf..8755331 100644 --- a/tools/search_tweets.py +++ b/tools/search_tweets.py @@ -138,10 +138,10 @@ def parse_cmd_args(): def main(): - parser = parse_cmd_args() args_dict = vars(parse_cmd_args().parse_args()) if args_dict.get("debug") is True: logger.setLevel(logging.DEBUG) + logger.debug("command line args dict:") logger.debug(json.dumps(args_dict, indent=4)) if args_dict.get("config_filename") is not None: @@ -149,6 +149,9 @@ def main(): else: configfile_dict = {} + logger.debug("config file dict:") + logger.debug(json.dumps(configfile_dict, indent=4)) + creds_dict = load_credentials(filename=args_dict["credential_file"], account_type=args_dict["account_type"], yaml_key=args_dict["credential_yaml_key"], @@ -160,6 +163,7 @@ def main(): dict_filter(args_dict), dict_filter(creds_dict)) + logger.debug("combined dict (cli, config, creds):") logger.debug(json.dumps(config_dict, indent=4)) if len(dict_filter(config_dict).keys() & REQUIRED_KEYS) < len(REQUIRED_KEYS): @@ -169,8 +173,6 @@ def main(): stream_params = gen_params_from_config(config_dict) - logger.debug(json.dumps(config_dict, indent=4)) - rs = ResultStream(tweetify=False, **stream_params) logger.debug(str(rs))