[pypy-commit] pypy py3k: Fixes after merge

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r50150:015df90d2965
Date: 2011-12-04 17:17 +0100
http://bitbucket.org/pypy/pypy/changeset/015df90d2965/

Log:	Fixes after merge

diff --git a/pypy/objspace/std/stringobject.py b/pypy/objspace/std/stringobject.py
--- a/pypy/objspace/std/stringobject.py
+++ b/pypy/objspace/std/stringobject.py
@@ -29,12 +29,12 @@
             return True
         if self.user_overridden_class or w_other.user_overridden_class:
             return False
-        return space.str_w(self) is space.str_w(w_other)
+        return space.bytes_w(self) is space.bytes_w(w_other)
 
     def unique_id(self, space):
         if self.user_overridden_class:
             return W_Object.unique_id(self, space)
-        return space.wrap(compute_unique_id(space.str_w(self)))
+        return space.wrap(compute_unique_id(space.bytes_w(self)))
 
 
 class W_StringObject(W_AbstractStringObject):