From 448a183515364b953772f2d66fed9df25f0309e2 Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Wed, 29 Sep 2021 14:16:06 +0200 Subject: [PATCH] Support pyyaml < 5.1 --- datadog_callback.py | 8 +++++++- requirements.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/datadog_callback.py b/datadog_callback.py index 8c05394..b22754b 100644 --- a/datadog_callback.py +++ b/datadog_callback.py @@ -69,8 +69,14 @@ def _set_logger_level(self, name, level=logging.WARNING): def _load_conf(self, file_path): conf_dict = {} if os.path.isfile(file_path): + try: + loader = yaml.FullLoader + except AttributeError: + # on pyyaml < 5.1, there's no FullLoader, + # but we can still use SafeLoader + loader = yaml.SafeLoader with open(file_path, 'r') as conf_file: - conf_dict = yaml.load(conf_file, Loader=yaml.FullLoader) + conf_dict = yaml.load(conf_file, Loader=loader) api_key = os.environ.get('DATADOG_API_KEY', conf_dict.get('api_key', '')) dd_url = os.environ.get('DATADOG_URL', conf_dict.get('url', '')) diff --git a/requirements.txt b/requirements.txt index 54c3d92..5fa4fe4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ datadog -pyyaml>=5.1 +pyyaml>=3.10 packaging