summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-09 14:16:18 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-09 14:16:18 +0100
commit1b9211fd5b1efa4e1b1a1007eb1d60c8e7e5363a (patch)
treeec1c6825364364da3c7857ffa19656eb46eb79ef
parentd99bc63dc94f20dbcc087706d91eefe395799892 (diff)
downloadpsutil-1b9211fd5b1efa4e1b1a1007eb1d60c8e7e5363a.tar.gz
try to fix travis err
-rw-r--r--psutil/tests/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index ebce7e7f..c500f0e8 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -241,6 +241,9 @@ def sh(cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
if p.returncode != 0:
raise RuntimeError(stderr)
if stderr:
+ if PY3:
+ stderr = str(stderr, sys.stderr.encoding or
+ sys.getfilesystemencoding())
warn(stderr)
if PY3:
stdout = str(stdout, sys.stdout.encoding or