From 3ea936312a4079f642c56402c2c2fb5ec1e65591 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 20 Jun 2018 19:04:55 -0700 Subject: [PATCH] Remove an unnecessary import from the ansiballz wrapper (#41747) --- changelogs/fragments/ansiballz_streamline_imports.yaml | 3 +++ lib/ansible/executor/module_common.py | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/ansiballz_streamline_imports.yaml diff --git a/changelogs/fragments/ansiballz_streamline_imports.yaml b/changelogs/fragments/ansiballz_streamline_imports.yaml new file mode 100644 index 0000000000..04aaec0141 --- /dev/null +++ b/changelogs/fragments/ansiballz_streamline_imports.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: +- Removed an unnecessary import from the AnsiballZ wrapper diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index 009eb06c48..feff2af2e3 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -143,12 +143,6 @@ if sys.version_info < (3,): else: unicode = str PY3 = True -try: - # Python-2.6+ - from io import BytesIO as IOStream -except ImportError: - # Python < 2.6 - from StringIO import StringIO as IOStream ZIPDATA = """%(zipdata)s"""