From e8e73e0eddb3864bd381eedb215fd84059bd728f Mon Sep 17 00:00:00 2001 From: Esteban Echeverry Date: Mon, 5 Jun 2017 10:37:23 -0500 Subject: [PATCH] Use to_text helper function to handle bytes and unicode --- lib/ansible/module_utils/lxd.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/lxd.py b/lib/ansible/module_utils/lxd.py index e05e4d54d0a..f9ec1fd4e29 100644 --- a/lib/ansible/module_utils/lxd.py +++ b/lib/ansible/module_utils/lxd.py @@ -33,7 +33,7 @@ import ssl from ansible.module_utils.urls import generic_urlparse from ansible.module_utils.six.moves.urllib.parse import urlparse from ansible.module_utils.six.moves import http_client -from ansible.module_utils.six import PY2 +from ansible.module_utils._text import to_text # httplib/http.client connection using unix domain socket HTTPConnection = http_client.HTTPConnection @@ -110,8 +110,7 @@ class LXDClient(object): self.connection.request(method, url, body=body) resp = self.connection.getresponse() resp_data = resp.read() - if not PY2: - resp_data = resp_data.decode('utf-8') + resp_data = to_text(resp_data, errors='surrogate_or_strict') resp_json = json.loads(resp_data) self.logs.append({ 'type': 'sent request',