diff options
| author | Michael Scherer <misc@zarb.org> | 2016-10-28 09:56:04 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-10-28 08:01:42 -0700 |
| commit | 3de9d8373b4ce7253ae3113939ad56bf5118286c (patch) | |
| tree | d5f4a1ff6ba072155ed20beb5bd21dff66adcac0 | |
| parent | 9d4ce0a94eb2b81c99475c482b0c04f0ca360de3 (diff) | |
| download | ansible-3de9d8373b4ce7253ae3113939ad56bf5118286c.tar.gz | |
Cleanup StringIO import for module_utils/shell.py
(cherry picked from commit 6052c1294bf65344bb182a0b71239c85009a026d)
| -rw-r--r-- | lib/ansible/module_utils/shell.py | 6 |
1 files changed, 1 insertions, 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=)'), |