[Checkins] SVN: zope.generic/trunk/src/zope/generic/configuration/base.py fix bug

Dominik Huber cvs-admin at zope.org
Thu Jun 15 11:50:17 EDT 2006


Log message for revision 68656:
  fix bug

Changed:
  U   zope.generic/trunk/src/zope/generic/configuration/base.py

-=-
Modified: zope.generic/trunk/src/zope/generic/configuration/base.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/base.py	2006-06-15 15:18:40 UTC (rev 68655)
+++ zope.generic/trunk/src/zope/generic/configuration/base.py	2006-06-15 15:50:14 UTC (rev 68656)
@@ -148,13 +148,17 @@
                 missedArguments.append(name)
 
         else:
+            field = __keyface__[name]
             value = data[name]
-            if isinstance(value, list):
+            if isinstance(value, list) and ISubConfigurationList.providedBy(field):
                 relevant_data[name] = ConfigurationList(value)
 
-            elif isinstance(value, dict):
+            elif isinstance(value, dict) and ISubConfigurationDict.providedBy(field):
                 relevant_data[name] = ConfigurationDict(value)
-           
+
+            elif isinstance(value, dict) and ISubConfiguration.providedBy(field):
+                relevant_data[name] = createConfiguration(field.schema, value)
+
             else:
                 relevant_data[name] = data[name]
     



More information about the Checkins mailing list