Author: jmorliaguet
Date: Tue May 2 11:37:50 2006
New Revision: 3019
Modified:
cpsskins/branches/paris-sprint-2006/setup/io.py
cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
Log:
- more robust import of fields. try: except: is no longer necessary.
Modified: cpsskins/branches/paris-sprint-2006/setup/io.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io.py Tue May 2 11:37:50 2006
@@ -150,15 +150,14 @@
continue
text = node.getAttribute(name)
+ print node.getAttribute(u'value')
field_io = IFieldIO(field, None)
if field_io is None:
raise TypeError("No field adapter found for '%s'." % field)
- try:
+ if text:
value = field_io.load(text)
setattr(context, name, value)
- except: # for testing - should not occur
- print text
# child nodes
for child_el in node.childNodes:
@@ -166,7 +165,13 @@
continue
if child_el.hasAttribute(u'value'):
- break
+ field_name = child_el.tagName
+ if name == field_name:
+ text = child_el.getAttribute(u'value')
+ if text:
+ value = field_io.load(text)
+ setattr(context, name, value)
+ continue
contentname = child_el.getAttribute(u'type') or child_el.tagName
factory_name = u'cpsskins.%s.%s' % (self.object_type, contentname)
Modified: cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/widget.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/widget.py Tue May
2 11:37:50 2006
@@ -70,7 +70,7 @@
for id, widget in list(getUtilitiesFor(configuration.IWidget)):
# skip widgets registered for a specific engine and widgets providing
# basic views
- if widget.engine or widget.basic:
+ if widget.engine: # or widget.basic:
continue
widgets.append((_(widget.title), id))
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
