diff options
Diffstat (limited to 'swift/common/manager.py')
| -rw-r--r-- | swift/common/manager.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/swift/common/manager.py b/swift/common/manager.py index 978e2fbb6..47f47d03b 100644 --- a/swift/common/manager.py +++ b/swift/common/manager.py @@ -22,6 +22,7 @@ import signal import time import subprocess import re +import six from swift import gettext_ as _ import tempfile @@ -720,6 +721,8 @@ class Server(object): else: output = proc.stdout.read() proc.stdout.close() + if not six.PY2: + output = output.decode('utf8', 'backslashreplace') if kwargs.get('once', False): # if you don't want once to wait you can send it to the |
