Changeset 4175 for waeup/branches/ulif-rewrite

Timestamp:

27 May 2009, 08:19:00 (16 years ago)

Author:

uli

Message:

• Unpack ZODB oids to make them printable
• In CSV import viewlet set receiverid as importer attribute

File:

• waeup/branches/ulif-rewrite/src/waeup/datacenter.py (modified) (3 diffs)

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

@@ -6 +6 @@
 import os
 import shutil
+import struct
 import sys
 import grok
@@ -136 +137 @@
         this case we can use the memory address of it.
         """
-        if hasattr(obj, '_p_oid'):
-            return getattr(obj, '_p_oid')
-        return str(id(obj))
+        if not hasattr(obj, '_p_oid'):
+            return str(id(obj))
+        oid = getattr(obj, '_p_oid')
+        return str(struct.unpack('>Q', oid)[0])
 
         
@@ -249 +251 @@
     def __init__(self, filedescr, importers):
         self.file = filedescr
-        self.importers = importers
+        self.importers = []
+        for importer, receiverid in importers:
+            importer.receiverid = receiverid
+            self.importers.append(importer)
         
 class ImportCSVMain(grok.Viewlet):