[pypy-svn] pypy default: Syntax for 2.5.

arigo commits-noreply at bitbucket.org
Mon Feb 14 14:11:05 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r41902:5d8a2eb2b157
Date: 2011-02-14 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/5d8a2eb2b157/

Log:	Syntax for 2.5.

diff --git a/pypy/objspace/std/test/test_bytes.py b/pypy/objspace/std/test/test_bytes.py
--- a/pypy/objspace/std/test/test_bytes.py
+++ b/pypy/objspace/std/test/test_bytes.py
@@ -222,8 +222,8 @@
         b = bytearray('mississippi')
         check(b.split('i'), ['m', 'ss', 'ss', 'pp', ''])
         check(b.split(memoryview('i')), ['m', 'ss', 'ss', 'pp', ''])
-        check(b.rsplit('i'), ['m', b'ss', b'ss', b'pp', b''])
-        check(b.rsplit(memoryview('i')), ['m', b'ss', b'ss', b'pp', b''])
+        check(b.rsplit('i'), ['m', 'ss', 'ss', 'pp', ''])
+        check(b.rsplit(memoryview('i')), ['m', 'ss', 'ss', 'pp', ''])
         check(b.rsplit('i', 2), ['mississ', 'pp', ''])
 
         check(bytearray('foo bar').split(), ['foo', 'bar'])
@@ -267,14 +267,14 @@
         assert b.pop(-2) == ord('r')
         raises(IndexError, b.pop, 10)
         raises(OverflowError, bytearray().pop)
-        assert bytearray(b'\xff').pop() == 0xff
+        assert bytearray('\xff').pop() == 0xff
 
     def test_remove(self):
         class Indexable:
             def __index__(self):
                 return ord('e')
 
-        b = bytearray(b'hello')
+        b = bytearray('hello')
         b.remove(ord('l'))
         assert b == 'helo'
         b.remove(ord('l'))


More information about the Pypy-commit mailing list