Python 3: there is no 'basestring'
This fixes a failing unit test. In actual use (which is still quite far), I'm not sure if bytes -> unicode conversion should be done here (in which case the code will fail with an AttributeError: 'bytes' object has no attribute 'readlines'), or inside self._connection.exec_command() (in which case my change is correct).
This commit is contained in:
parent
3f5ea43fb8
commit
9cdb6ebae3
1 changed files with 5 additions and 4 deletions
|
@ -19,16 +19,17 @@
|
|||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
from six.moves import StringIO
|
||||
import base64
|
||||
import json
|
||||
import os
|
||||
import random
|
||||
import stat
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
|
||||
from six import string_types
|
||||
from six.moves import StringIO
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible.errors import AnsibleError, AnsibleConnectionFailure
|
||||
from ansible.executor.module_common import modify_module
|
||||
|
@ -463,12 +464,12 @@ class ActionBase:
|
|||
rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, in_data=in_data, sudoable=sudoable)
|
||||
self._display.debug("command execution done")
|
||||
|
||||
if not isinstance(stdout, basestring):
|
||||
if not isinstance(stdout, string_types):
|
||||
out = ''.join(stdout.readlines())
|
||||
else:
|
||||
out = stdout
|
||||
|
||||
if not isinstance(stderr, basestring):
|
||||
if not isinstance(stderr, string_types):
|
||||
err = ''.join(stderr.readlines())
|
||||
else:
|
||||
err = stderr
|
||||
|
|
Loading…
Reference in a new issue