[pypy-commit] pypy jit-refactor-tests: hg merge default

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-refactor-tests
Changeset: r49822:9c22905d5d42
Date: 2011-11-26 16:11 +0100
http://bitbucket.org/pypy/pypy/changeset/9c22905d5d42/

Log:	hg merge default

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -191,7 +191,7 @@
     def is_w(self, space, w_other):
         return self is w_other
 
-    def id(self, space):
+    def unique_id(self, space):
         return space.wrap(compute_unique_id(self))
 
     def str_w(self, space):
@@ -697,7 +697,7 @@
         return w_two.is_w(self, w_one)
 
     def id(self, w_obj):
-        return w_obj.id(self)
+        return w_obj.unique_id(self)
 
     def hash_w(self, w_obj):
         """shortcut for space.int_w(space.hash(w_obj))"""
diff --git a/pypy/objspace/std/complexobject.py b/pypy/objspace/std/complexobject.py
--- a/pypy/objspace/std/complexobject.py
+++ b/pypy/objspace/std/complexobject.py
@@ -31,9 +31,9 @@
         imag2 = float2longlong(imag2)
         return real1 == real2 and imag1 == imag2
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         from pypy.rlib.longlong2float import float2longlong
         from pypy.objspace.std.model import IDTAG_COMPLEX as tag
         real = space.float_w(space.getattr(self, space.wrap("real")))
diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py
--- a/pypy/objspace/std/floatobject.py
+++ b/pypy/objspace/std/floatobject.py
@@ -34,9 +34,9 @@
         two = float2longlong(space.float_w(w_other))
         return one == two
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         from pypy.rlib.longlong2float import float2longlong
         from pypy.objspace.std.model import IDTAG_FLOAT as tag
         val = float2longlong(space.float_w(self))
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -26,9 +26,9 @@
             return self is w_other
         return space.int_w(self) == space.int_w(w_other)
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         from pypy.objspace.std.model import IDTAG_INT as tag
         b = space.bigint_w(self)
         b = b.lshift(3).or_(rbigint.fromint(tag))
diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -18,9 +18,9 @@
             return self is w_other
         return space.bigint_w(self).eq(space.bigint_w(w_other))
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         from pypy.objspace.std.model import IDTAG_LONG as tag
         b = space.bigint_w(self)
         b = b.lshift(3).or_(rbigint.fromint(tag))
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
@@ -32,9 +32,9 @@
             return False
         return space.str_w(self) is space.str_w(w_other)
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         return space.wrap(compute_unique_id(space.str_w(self)))
 
 
diff --git a/pypy/objspace/std/unicodeobject.py b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -32,9 +32,9 @@
             return False
         return space.unicode_w(self) is space.unicode_w(w_other)
 
-    def id(self, space):
+    def unique_id(self, space):
         if self.user_overridden_class:
-            return W_Object.id(self, space)
+            return W_Object.unique_id(self, space)
         return space.wrap(compute_unique_id(space.unicode_w(self)))