From d46d92eed527272893be049e69c0b26d8f9b1a5d Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 23 Oct 2018 09:10:28 +1000 Subject: [PATCH] Revert "WinRM/PSRP: Fix UTF-8 issue (#46998)" (#47447) This reverts commit 1bb674034f78260d1cbe42b35c05cc462471a6f5. --- changelogs/fragments/psrp-utf8.yaml | 2 -- lib/ansible/plugins/connection/psrp.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 changelogs/fragments/psrp-utf8.yaml diff --git a/changelogs/fragments/psrp-utf8.yaml b/changelogs/fragments/psrp-utf8.yaml deleted file mode 100644 index cf04763a12..0000000000 --- a/changelogs/fragments/psrp-utf8.yaml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: -- psrp - Fix issue when dealing with unicode values in the output for Python 2 - https://github.com/ansible/ansible/pull/46998 diff --git a/lib/ansible/plugins/connection/psrp.py b/lib/ansible/plugins/connection/psrp.py index 4a5b53e07f..ff8c5de324 100644 --- a/lib/ansible/plugins/connection/psrp.py +++ b/lib/ansible/plugins/connection/psrp.py @@ -557,7 +557,7 @@ if ($bytes_read -gt 0) { # create our own output based on the properties if that is the # case+ try: - output_msg = to_text(output) + output_msg = str(output) except TypeError: if isinstance(output, GenericComplexObject): obj_lines = output.property_sets