From 6772b4d1fd979d27c5d02fd2ef146dbccb8b0a9e Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Mon, 25 Jul 2016 13:24:51 -0400
Subject: [PATCH] Leave captured stdout as Unicode on Python 3

---
 test/test_ui.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/test_ui.py b/test/test_ui.py
index 411901898..558c00932 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -23,6 +23,7 @@ import re
 import subprocess
 import platform
 from copy import deepcopy
+import six
 
 from mock import patch, Mock
 from test import _common
@@ -65,7 +66,9 @@ class ListTest(unittest.TestCase):
         with capture_stdout() as stdout:
             self._run_list([u'na\xefve'])
         out = stdout.getvalue()
-        self.assertTrue(u'na\xefve' in out.decode(stdout.encoding))
+        if six.PY2:
+            out = out.decode(stdout.encoding)
+        self.assertTrue(u'na\xefve' in out)
 
     def test_list_item_path(self):
         with capture_stdout() as stdout: