Skip to content

Support pyyaml < 5.1 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2021
Merged

Support pyyaml < 5.1 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion datadog_callback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', ''))
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
datadog
pyyaml>=5.1
pyyaml>=3.10
packaging