[pypy-commit] pypy stdlib-2.7.8: fix translation: uid is based on id (not rpython), we need to use getaddrstring

pjenvey noreply at buildbot.pypy.org
Sat Aug 23 02:15:26 CEST 2014


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: stdlib-2.7.8
Changeset: r72982:6f4816e0e4a2
Date: 2014-07-27 13:03 -0700
http://bitbucket.org/pypy/pypy/changeset/6f4816e0e4a2/

Log:	fix translation: uid is based on id (not rpython), we need to use
	getaddrstring instead (grafted from
	6f49b270e66a0cbd2a2a3edf673bee80066e5099)

diff --git a/pypy/interpreter/nestedscope.py b/pypy/interpreter/nestedscope.py
--- a/pypy/interpreter/nestedscope.py
+++ b/pypy/interpreter/nestedscope.py
@@ -69,8 +69,9 @@
         if self.w_value is None:
             content = "empty"
         else:
-            content = "%s object at 0x%x" % (space.type(self.w_value).name, uid(self.w_value))
-        s = "<cell at 0x%x: %s>" % (uid(self), content)
+            content = "%s object at 0x%s" % (space.type(self.w_value).name,
+                                             self.w_value.getaddrstring(space))
+        s = "<cell at 0x%s: %s>" % (self.getaddrstring(space), content)
         return space.wrap(s.decode('utf-8'))
 
     def descr__cell_contents(self, space):


More information about the pypy-commit mailing list