Changeset 4184

Timestamp:

27 May 2009, 09:32:41 (16 years ago)

Author:

uli

Message:

Make receiverid more robust.

File:

• waeup/branches/ulif-rewrite/src/waeup/datacenter.py (modified) (1 diff)

waeup/branches/ulif-rewrite/src/waeup/datacenter.py

@@ -144 +144 @@
         memory only and will vanish as soon as the request is over. In
         this case we can use the memory address of it.
+
+        Both, the id() result and the ZODB oid, are actually integers
+        which we return as strings. To make the difference chrystal
+        clear, we prepend ``z`` to ids taken from ZODB oids.
         """
         if not hasattr(obj, '_p_oid'):
             return str(id(obj))
         oid = getattr(obj, '_p_oid')
-        return str(struct.unpack('>Q', oid)[0])
+        if oid is None:
+            # The persistent object is not stored in the ZODB
+            return str(id(obj))
+        return 'z%s' % struct.unpack('>Q', oid)[0]