From 77f73f6d2ae265b91c976567eef8ead69cec5bcf Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Fri, 28 Sep 2018 12:51:17 -0400 Subject: [PATCH] Use unicode instead of bytes (#46234) The stdout and stderr values returned from self._low_level_execute() are text, not bytes. This results in an error in Python 3 since str and bytes cannot be concatenated. Changing to unicode type allows this to work without error on Python 2 and Python 3. --- changelogs/fragments/reboot-unicode-string.yaml | 3 +++ lib/ansible/plugins/action/reboot.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/reboot-unicode-string.yaml diff --git a/changelogs/fragments/reboot-unicode-string.yaml b/changelogs/fragments/reboot-unicode-string.yaml new file mode 100644 index 0000000000..5ac36b924b --- /dev/null +++ b/changelogs/fragments/reboot-unicode-string.yaml @@ -0,0 +1,3 @@ +bugfixes: + - reboot - use unicode instead of bytes for stdout and stderr to match the + type returned from low_level_execute() diff --git a/lib/ansible/plugins/action/reboot.py b/lib/ansible/plugins/action/reboot.py index 4dd90149a5..a440ff3875 100644 --- a/lib/ansible/plugins/action/reboot.py +++ b/lib/ansible/plugins/action/reboot.py @@ -94,8 +94,8 @@ class ActionModule(ActionBase): return reboot_command def get_system_boot_time(self): - stdout = b'' - stderr = b'' + stdout = u'' + stderr = u'' command_result = self._low_level_execute_command(self.DEFAULT_BOOT_TIME_COMMAND, sudoable=self.DEFAULT_SUDOABLE) # For single board computers, e.g., Raspberry Pi, that lack a real time clock and are using fake-hwclock