Merge ~cjwatson/launchpad:py3-fix-doctest-output into launchpad:master

[Colin Watson]

Adjust fix_doctest_output to coerce to str, not bytes

doctest._SpoofOut writes to a StringIO.StringIO on Python 2, but an io.StringIO on Python 3.

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

diff --git a/lib/lp/scripts/utilities/test.py b/lib/lp/scripts/utilities/test.py
index 167d5c4..e1e67b8 100755
--- a/lib/lp/scripts/utilities/test.py
+++ b/lib/lp/scripts/utilities/test.py
@@ -44,7 +44,7 @@ def fix_doctest_output():
     class _SpoofOut(doctest._SpoofOut):
 
         def write(self, value):
-            _RealSpoofOut.write(self, six.ensure_binary(value))
+            _RealSpoofOut.write(self, six.ensure_str(value))
 
     doctest._SpoofOut = _SpoofOut