Merge lp:~gz/testtools/wrap_utf8_terminals_804122 into lp:~testtools-committers/testtools/trunk

[Martin Packman]

Fixes a misunderstanding I had about how smart Python 2 was when writing unicode to streams with a unicode encoding. Only print does the right thing, the write method is still dumb and some parts of testtools use `stream.write` rather than `print >>stream`.

There's a slight risk here in that a utf-8 stream will now reject non-ascii bytestrings, but that's what my terminal has been doing since I introduced this code.

[lp:~gz/testtools/wrap_utf8_terminals_804122]

199. By Martin Packman on 2011-07-01

Fix test on Python 3

[Jonathan Lange (jml)]

Thanks for the fix. I'm going to try splitting the test into two to see if it's more clear that way.

=== modified file 'testtools/compat.py'
--- testtools/compat.py	2011-04-24 21:48:56 +0000
+++ testtools/compat.py	2011-07-01 18:06:39 +0000
@@ -119,7 +119,9 @@
         return codecs.getwriter("ascii")(stream, "replace")
     if writer.__module__.rsplit(".", 1)[1].startswith("utf"):
         # The current stream has a unicode encoding so no error handler is needed
-        return stream
+        if sys.version_info > (3, 0):
+            return stream
+        return writer(stream)
     if sys.version_info > (3, 0):
         # Python 3 doesn't seem to make this easy, handle a common case
         try:

=== modified file 'testtools/tests/test_compat.py'
--- testtools/tests/test_compat.py	2010-11-29 00:21:59 +0000
+++ testtools/tests/test_compat.py	2011-07-01 18:06:39 +0000
@@ -15,6 +15,7 @@
     _detect_encoding,
     _get_source_encoding,
     _u,
+    str_is_unicode,
     unicode_output_stream,
     )
 from testtools.matchers import (
@@ -225,14 +226,18 @@
         unicode_output_stream(sout).write(self.uni)
         self.assertEqual([_b("pa?\xe8?n")], sout.writelog)
 
-    def test_unicode_encodings_not_wrapped(self):
-        """A unicode encoding is left unwrapped as needs no error handler"""
+    def test_unicode_encodings_wrapped(self):
+        """A unicode encoding is wrapped but needs no error handler"""
         sout = _FakeOutputStream()
         sout.encoding = "utf-8"
-        self.assertIs(unicode_output_stream(sout), sout)
-        sout = _FakeOutputStream()
-        sout.encoding = "utf-16-be"
-        self.assertIs(unicode_output_stream(sout), sout)
+        uout = unicode_output_stream(sout)
+        if str_is_unicode:
+            # No wrapping needed if native str type is unicode
+            self.assertIs(uout, sout)
+            return
+        self.assertEqual(uout.errors, "strict")
+        uout.write(self.uni)
+        self.assertEqual([_b("pa\xc9\xaa\xce\xb8\xc9\x99n")], sout.writelog)
 
     def test_stringio(self):
         """A StringIO object should maybe get an ascii native str type"""