[Checkins] SVN: z3c.form/trunk/ Avoid fail when converting text fields if value is not send in unicode.

[Thomas Desvenain]

Log message for revision 122530:
  Avoid fail when converting text fields if value is not send in unicode.

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/src/z3c/form/converter.py

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2011-08-10 16:12:24 UTC (rev 122529)
+++ z3c.form/trunk/CHANGES.txt	2011-08-10 16:44:08 UTC (rev 122530)
@@ -5,7 +5,7 @@
 2.4.5 (unreleased)
 ------------------
 
-- Avoid fail when converting integer with spaces if value is not send in unicode.
+- Avoid fail at field conversion when value is not send in unicode.
 
 
 2.4.4 (2011-07-11)

Modified: z3c.form/trunk/src/z3c/form/converter.py
===================================================================
--- z3c.form/trunk/src/z3c/form/converter.py	2011-08-10 16:12:24 UTC (rev 122529)
+++ z3c.form/trunk/src/z3c/form/converter.py	2011-08-10 16:44:08 UTC (rev 122530)
@@ -46,7 +46,10 @@
         """See interfaces.IDataConverter"""
         if value == u'':
             return self.field.missing_value
-        return self.field.fromUnicode(value)
+        if type(value) is unicode:
+            return self.field.fromUnicode(value)
+        else:
+            return self.field.fromUnicode(unicode(value))
 
     def __repr__(self):
         return '<%s converts from %s to %s>' %(