From aad286b403746c6e44ab760b2879fd36aaaf3ebd Mon Sep 17 00:00:00 2001 From: Stefan Horning Date: Fri, 31 Jan 2020 20:37:36 +0100 Subject: [PATCH] =?UTF-8?q?Make=20cloudfront=5Finfo=20work=20with=20Python?= =?UTF-8?q?3=20=E2=80=A6=20(#66695)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Make cloudfront_info work with Python3 by using dict.update(dict) instead of dict += dict. * Added changelog fragment for cloudfront_info fix --- changelogs/fragments/66695-cloudfront-info-python3-fix.yml | 2 ++ lib/ansible/modules/cloud/amazon/cloudfront_info.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/66695-cloudfront-info-python3-fix.yml diff --git a/changelogs/fragments/66695-cloudfront-info-python3-fix.yml b/changelogs/fragments/66695-cloudfront-info-python3-fix.yml new file mode 100644 index 00000000000..686931afe5c --- /dev/null +++ b/changelogs/fragments/66695-cloudfront-info-python3-fix.yml @@ -0,0 +1,2 @@ +bugfixes: + - Make cloudfront_info module work with Python 3 diff --git a/lib/ansible/modules/cloud/amazon/cloudfront_info.py b/lib/ansible/modules/cloud/amazon/cloudfront_info.py index 4845cf779d3..c06959ff165 100644 --- a/lib/ansible/modules/cloud/amazon/cloudfront_info.py +++ b/lib/ansible/modules/cloud/amazon/cloudfront_info.py @@ -504,7 +504,7 @@ class CloudFrontServiceManager: 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']: