[pypy-commit] pypy py3k: remove a u'', s/unichr/chr/, kill 'long'

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r52996:f65e4286332e
Date: 2012-02-28 18:43 +0100
http://bitbucket.org/pypy/pypy/changeset/f65e4286332e/

Log:	remove a u'', s/unichr/chr/, kill 'long'

diff --git a/pypy/module/marshal/test/test_marshal.py b/pypy/module/marshal/test/test_marshal.py
--- a/pypy/module/marshal/test/test_marshal.py
+++ b/pypy/module/marshal/test/test_marshal.py
@@ -162,13 +162,13 @@
 
     def test_unicode(self):
         import marshal, sys
-        self.marshal_check(u'\uFFFF')
+        self.marshal_check('\uFFFF')
 
-        self.marshal_check(unichr(sys.maxunicode))
+        self.marshal_check(chr(sys.maxunicode))
 
     def test_reject_subtypes(self):
         import marshal
-        types = (float, complex, int, long, tuple, list, dict, set, frozenset)
+        types = (float, complex, int, tuple, list, dict, set, frozenset)
         for cls in types:
             class subtype(cls):
                 pass