[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/components.py Merge from 1.3 branch

Wichert Akkerman wichert at wiggy.net
Sun Dec 16 09:46:24 EST 2007


Log message for revision 82301:
  Merge from 1.3 branch

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/components.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/components.py	2007-12-16 14:41:56 UTC (rev 82300)
+++ Products.GenericSetup/trunk/Products/GenericSetup/components.py	2007-12-16 14:46:24 UTC (rev 82301)
@@ -221,8 +221,12 @@
             if getattr(comp, 'aq_base', None) is not None:
                 if aq_base(comp) is site:
                     child.setAttribute('object', '')
+                elif hasattr(aq_base(comp), 'getId'):
+                    child.setAttribute('object', comp.getId())
                 else:
-                    child.setAttribute('object', comp.getId())
+                    # This is a five.localsitemanager wrapped utility
+                    factory = _getDottedName(type(aq_base(comp)))
+                    child.setAttribute('factory', factory)
             else:
                 factory = _getDottedName(type(comp))
                 child.setAttribute('factory', factory)



More information about the Checkins mailing list