[CMF-checkins] CVS: CMF/CMFSetup - utils.py:1.20

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv21563/CMFSetup

Modified Files:
	utils.py 
Log Message:
- fixed handling of comments and empty descriptions


=== CMF/CMFSetup/utils.py 1.19 => 1.20 ===
--- CMF/CMFSetup/utils.py:1.19	Sat May  7 08:44:39 2005
+++ CMF/CMFSetup/utils.py	Sun May  8 14:59:21 2005
@@ -184,6 +184,9 @@
         for child in node.childNodes:
             name = child.nodeName
 
+            if name == '#comment':
+                continue
+
             if not name == '#text':
                 key = node_map[name].get(KEY, str(name) )
                 info[key] = info.setdefault( key, () ) + (
@@ -220,7 +223,6 @@
               'meta_type':       {},
               'insert-before':   {},
               'insert-after':    {},
-              'remove':          {},
               'property':        {KEY: 'properties', DEFAULT: ()},
               'object':          {KEY: 'objects', DEFAULT: ()} },
           'property':
@@ -232,7 +234,7 @@
           'element':
             { 'value':           {KEY: None} },
           'description':
-            { '#text':           {KEY: None} } }
+            { '#text':           {KEY: None, DEFAULT: ''} } }
 
     def _convertToBoolean(self, val):