Merged in graingert/six (pull request #48)

1 files changed, 21 insertions, 0 deletions

diff --git a/test_six.py b/test_six.py
index 2a9ca74..4e95394 100644
--- a/test_six.py
+++ b/test_six.py
@@ -822,3 +822,24 @@ def test_assertRaisesRegex():
                     raise AssertionError('Bar')
 
     TestAssertRaisesRegex('test').test()
+
+
+def test_python_2_unicode_compatible():
+    @six.python_2_unicode_compatible
+    class MyTest(object):
+        def __str__(self):
+            return six.u('hello')
+
+        def __bytes__(self):
+            return six.b('hello')
+
+    my_test = MyTest()
+
+    if six.PY2:
+        assert str(my_test) == six.b("hello")
+        assert unicode(my_test) == six.u("hello")
+    elif six.PY3:
+        assert bytes(my_test) == six.b("hello")
+        assert str(my_test) == six.u("hello")
+
+    assert getattr(six.moves.builtins, 'bytes', str)(my_test) == six.b("hello")