Archetypes/Extensions migrations.py,1.9.16.9,1.9.16.10

Update of /cvsroot/archetypes/Archetypes/Extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20015/Extensions

Modified Files:
      Tag: release-1_3-branch
        migrations.py 
Log Message:
aq_base() is much better

Index: migrations.py
===================================================================
RCS file: /cvsroot/archetypes/Archetypes/Extensions/migrations.py,v
retrieving revision 1.9.16.9
retrieving revision 1.9.16.10
diff -u -d -r1.9.16.9 -r1.9.16.10
--- migrations.py       24 Jul 2004 21:43:48 -0000      1.9.16.9
+++ migrations.py       26 Jul 2004 14:50:29 -0000      1.9.16.10
@@ -52,7 +52,7 @@
         allbrains = uc()
         for brain in allbrains:
             sourceObj = brain.getObject()
-            sourceUID = getattr(sourceObj.aq_base, olduididx, None)
+            sourceUID = getattr(aq_base(sourceObj), olduididx, None)
             if not sourceUID: continue
             # references migration starts
             for targetUID, relationship in refs.get(sourceUID, []):
@@ -128,7 +128,7 @@
         if not IBaseObject.isImplementedBy(obj): 
             continue #its no Archetype instance, so leave it
         
-        objUID = getattr(obj.aq_base, '_uid', None)        
+        objUID = getattr(aq_base(obj), '_uid', None)        
         if objUID: #continue    # not an old style AT?
             setattr(obj, olduididx, objUID) # this one can be part of the 
catalog
             delattr(obj, '_uid')
@@ -154,7 +154,7 @@
     for brain in allbrains:
         #Get a uid for each thingie
         obj = brain.getObject()
-        objUID = getattr(obj.aq_base, olduididx, None)        
+        objUID = getattr(aq_base(obj), olduididx, None)        
         if not objUID: continue # not an old style AT
         delattr(obj, olduididx)
         obj._updateCatalog(portal) 



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click