[Erp5-report] r32872 leonardo - /erp5/trunk/products/ERP5Type/patches/XMLExportImport.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Fri Feb 19 17:55:51 2010
New Revision: 32872

URL: http://svn.erp5.org?rev=32872&view=rev
Log:
Import u64 and p64 from canonical locations

Modified:
    erp5/trunk/products/ERP5Type/patches/XMLExportImport.py

Modified: erp5/trunk/products/ERP5Type/patches/XMLExportImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/XMLExportImport.py?rev=32872&r1=32871&r2=32872&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/XMLExportImport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/XMLExportImport.py [utf8] Fri Feb 19 17:55:51 2010
@@ -14,6 +14,7 @@
 
 # Make sure the xml export will be ordered
 
+from ZODB.utils import u64, p64
 from Shared.DC.xml import ppml
 from base64 import encodestring
 from cStringIO import StringIO
@@ -106,10 +107,10 @@
     q=ppml.ToXMLUnpickler
     f=StringIO(p)
     u=q(f)
-    id=ppml.u64(oid)
+    id=u64(oid)
     id = id_mapping[id]
     old_aka = encodestring(oid)[:-1]
-    aka=encodestring(ppml.p64(long(id)))[:-1]  # Rebuild oid based on mapped id
+    aka=encodestring(p64(long(id)))[:-1]  # Rebuild oid based on mapped id
     id_mapping.setConvertedAka(old_aka, aka)
     u.idprefix=str(id)+'.'
     p=u.load(id_mapping=id_mapping).__str__(4)