internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use unicode instead of bytes (#46234)

Browse Source 
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.
This commit is contained in:
Sam Doran
2018-09-28 12:51:17 -04:00
committed by GitHub
parent 00d78d7ef3
commit 77f73f6d2a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelogs/fragments/reboot-unicode-string.yaml Normal file
View File

@@ -0,0 +1,3 @@
bugfixes:
- reboot - use unicode instead of bytes for stdout and stderr to match the
type returned from low_level_execute()

4
lib/ansible/plugins/action/reboot.py
View File

@@ -94,8 +94,8 @@ class ActionModule(ActionBase):
return reboot_command return reboot_command
def get_system_boot_time(self): def get_system_boot_time(self):
stdout = b'' stdout = u''
stderr = b'' stderr = u''
command_result = self._low_level_execute_command(self.DEFAULT_BOOT_TIME_COMMAND, sudoable=self.DEFAULT_SUDOABLE) 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 # For single board computers, e.g., Raspberry Pi, that lack a real time clock and are using fake-hwclock