[pypy-commit] pypy py3k: 2to3

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r68983:ffa7cbdd7233
Date: 2014-01-28 12:48 -0800
http://bitbucket.org/pypy/pypy/changeset/ffa7cbdd7233/

Log:	2to3

diff --git a/pypy/interpreter/pyparser/test/test_parsestring.py b/pypy/interpreter/pyparser/test/test_parsestring.py
--- a/pypy/interpreter/pyparser/test/test_parsestring.py
+++ b/pypy/interpreter/pyparser/test/test_parsestring.py
@@ -109,7 +109,7 @@
     def test_wide_unicode_in_source(self):
         if sys.maxunicode == 65535:
             py.test.skip("requires a wide-unicode host")
-        self.parse_and_compare('u"\xf0\x9f\x92\x8b"',
+        self.parse_and_compare('"\xf0\x9f\x92\x8b"',
                                unichr(0x1f48b),
                                encoding='utf-8')
 
diff --git a/pypy/module/__pypy__/test/test_special.py b/pypy/module/__pypy__/test/test_special.py
--- a/pypy/module/__pypy__/test/test_special.py
+++ b/pypy/module/__pypy__/test/test_special.py
@@ -80,9 +80,9 @@
 
         l = [1, 2, 3]
         assert list_strategy(l) == "int"
+        l = [b"a", b"b", b"c"]
+        assert list_strategy(l) == "bytes"
         l = ["a", "b", "c"]
-        assert list_strategy(l) == "bytes"
-        l = [u"a", u"b", u"c"]
         assert list_strategy(l) == "unicode"
         l = [1.1, 2.2, 3.3]
         assert list_strategy(l) == "float"