From fa8c07a33c5afb39ad5b385c70f3b120182cc537 Mon Sep 17 00:00:00 2001 From: Stefan Horning Date: Mon, 10 Feb 2020 16:22:00 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Make=20cloudfront=5Finfo=20work=20wit?= =?UTF-8?q?h=20Python3=20=E2=80=A6=20(#66695)"=20(#67085)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit aad286b403746c6e44ab760b2879fd36aaaf3ebd. --- changelogs/fragments/66695-cloudfront-info-python3-fix.yml | 2 -- lib/ansible/modules/cloud/amazon/cloudfront_info.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete 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 deleted file mode 100644 index 686931afe5c..00000000000 --- a/changelogs/fragments/66695-cloudfront-info-python3-fix.yml +++ /dev/null @@ -1,2 +0,0 @@ -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 c06959ff165..4845cf779d3 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.update(self.list_streaming_distributions(False)) + distributions += self.list_streaming_distributions(False) for dist in distributions: if 'Items' in dist['Aliases']: for alias in dist['Aliases']['Items']: