Skip to content

Commit

Permalink
Make cloudfront_info work with Python3 … (ansible#66695)
Browse files Browse the repository at this point in the history
* Make cloudfront_info work with Python3 by using dict.update(dict) instead of dict += dict.

* Added changelog fragment for cloudfront_info fix
  • Loading branch information
stefanhorning authored Jan 31, 2020
1 parent 3dbc03d commit aad286b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions changelogs/fragments/66695-cloudfront-info-python3-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- Make cloudfront_info module work with Python 3
2 changes: 1 addition & 1 deletion lib/ansible/modules/cloud/amazon/cloudfront_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def get_distribution_id_from_domain_name(self, domain_name):
try:
distribution_id = ""
distributions = self.list_distributions(False)
distributions += self.list_streaming_distributions(False)
distributions.update(self.list_streaming_distributions(False))
for dist in distributions:
if 'Items' in dist['Aliases']:
for alias in dist['Aliases']['Items']:
Expand Down

0 comments on commit aad286b

Please sign in to comment.