From e8c75c6bc7cc1d0bd3f7835c31ffc997a8b96f91 Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leonardo@nexedi.com>
Date: Fri, 19 Feb 2010 16:55:51 +0000
Subject: [PATCH] Import u64 and p64 from canonical locations
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32872 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Type/patches/XMLExportImport.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/product/ERP5Type/patches/XMLExportImport.py b/product/ERP5Type/patches/XMLExportImport.py
index 96e44b596b..5e2c735748 100644
--- a/product/ERP5Type/patches/XMLExportImport.py
+++ b/product/ERP5Type/patches/XMLExportImport.py
@@ -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 @@ def XMLrecord(oid, plen, p, id_mapping):
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)
--
2.30.9