Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv8194/CMFSetup
Modified Files:
Tag: CMF-1_5-branch
utils.py
Log Message:
- if the DEFAULT value is used, CONVERTER is no longer called
- reverted obsolete change in _convertToBoolean()
=== CMF/CMFSetup/utils.py 1.13.2.3 => 1.13.2.4 ===
--- CMF/CMFSetup/utils.py:1.13.2.3 Thu Mar 10 09:42:26 2005
+++ CMF/CMFSetup/utils.py Tue Apr 5 13:19:34 2005
@@ -204,7 +204,7 @@
else:
info[key] = v[DEFAULT]
- if CONVERTER in v and key in info:
+ elif CONVERTER in v and key in info:
info[key] = v[CONVERTER]( info[key] )
if key is None:
@@ -232,10 +232,8 @@
{ '#text': {KEY: None} } }
def _convertToBoolean(self, val):
- if isinstance(val, basestring):
- return val.lower() in ('true', 'yes', '1')
- else:
- return val
+
+ return val.lower() in ('true', 'yes', '1')
def _convertToUnique(self, val):
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
