From 6052c1294bf65344bb182a0b71239c85009a026d Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 28 Oct 2016 09:56:04 +0200 Subject: [PATCH] Cleanup StringIO import for module_utils/shell.py --- lib/ansible/module_utils/shell.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/ansible/module_utils/shell.py b/lib/ansible/module_utils/shell.py index 266347f0dc..d02a0b6eec 100644 --- a/lib/ansible/module_utils/shell.py +++ b/lib/ansible/module_utils/shell.py @@ -21,11 +21,6 @@ import re import socket import time -# py2 vs py3; replace with six via ansiballz -try: - from StringIO import StringIO -except ImportError: - from io import StringIO try: import paramiko @@ -36,6 +31,7 @@ except ImportError: from ansible.module_utils.basic import get_exception from ansible.module_utils.network import NetworkError +from ansible.module_utils.six.moves import StringIO ANSI_RE = [ re.compile(r'(\x1b\[\?1h\x1b=)'),