diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-09-20 21:32:15 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-09-21 19:51:31 -0700 |
| commit | 5048f46340d5de867c5fad9e740088535c8cb705 (patch) | |
| tree | ef99d4c60c3e14a338ea04f9e1529f3a020df9a5 | |
| parent | c5f5277183abe0bfde1bb19c8ff7971fbb9b7b61 (diff) | |
| download | ansible-5048f46340d5de867c5fad9e740088535c8cb705.tar.gz | |
Fix docker_service python3 incompatibility
Looks like this is supposed to operate on native strings so there's no
need to encode or decode at all here
Fixes #30354
(cherry picked from commit f66c74915c3e1ab5c8c1577c3eafab895e5f72ee)
| -rwxr-xr-x | lib/ansible/modules/cloud/docker/docker_service.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/modules/cloud/docker/docker_service.py b/lib/ansible/modules/cloud/docker/docker_service.py index eb1a88cfbb..c9580ddb24 100755 --- a/lib/ansible/modules/cloud/docker/docker_service.py +++ b/lib/ansible/modules/cloud/docker/docker_service.py @@ -520,7 +520,7 @@ def get_redirected_output(path_name): with open(path_name, 'r') as fd: for line in fd: # strip terminal format/color chars - new_line = re.sub(r'\x1b\[.+m', '', line.encode('ascii')) + new_line = re.sub(r'\x1b\[.+m', '', line) output.append(new_line) fd.close() os.remove(path_name) |