[pypy-commit] pypy default: merge heads

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r64118:e980bdaef1cb
Date: 2013-05-15 10:41 +0200
http://bitbucket.org/pypy/pypy/changeset/e980bdaef1cb/

Log:	merge heads

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -666,7 +666,8 @@
     def id(self, w_obj):
         w_result = w_obj.immutable_unique_id(self)
         if w_result is None:
-            w_result = self.wrap(compute_unique_id(w_obj))
+            # in the common case, returns an unsigned value
+            w_result = self.wrap(r_uint(compute_unique_id(w_obj)))
         return w_result
 
     def hash_w(self, w_obj):
diff --git a/rpython/rlib/rbigint.py b/rpython/rlib/rbigint.py
--- a/rpython/rlib/rbigint.py
+++ b/rpython/rlib/rbigint.py
@@ -458,10 +458,6 @@
         if (self.sign != other.sign or
             self.numdigits() != other.numdigits()):
             return False
-        
-        # Fast path.
-        if len(self._digits) == len(other._digits):
-            return self._digits == other._digits
 
         i = 0
         ld = self.numdigits()