[pypy-commit] pypy py3k: make unicode the official StringObjectCls

[gutworth]

Author: Benjamin Peterson <benjamin at python.org>
Branch: py3k
Changeset: r53316:a81aa4b01a36
Date: 2012-03-11 23:10 -0700
http://bitbucket.org/pypy/pypy/changeset/a81aa4b01a36/

Log:	make unicode the official StringObjectCls

diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -31,6 +31,7 @@
 from pypy.objspace.std.stringobject import W_StringObject
 from pypy.objspace.std.tupleobject import W_AbstractTupleObject
 from pypy.objspace.std.typeobject import W_TypeObject
+from pypy.objspace.std.unicodeobject import W_UnicodeObject
 
 # types
 from pypy.objspace.std.inttype import wrapint
@@ -48,10 +49,7 @@
 
         self.FrameClass = frame.build_frame(self)
 
-        if self.config.objspace.std.withrope:
-            self.StringObjectCls = W_RopeObject
-        else:
-            self.StringObjectCls = W_StringObject
+        self.StringObjectCls = W_UnicodeObject
 
         self._install_multimethods()