Skip to content

Commit

Permalink
revert r122530 and 122529, plone.z3cform.z2.processInputs was not cal…
Browse files Browse the repository at this point in the history
…led in our custom update method
  • Loading branch information
vincentfretin committed Aug 25, 2011
1 parent 1c66635 commit f178cca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Expand Up @@ -5,7 +5,7 @@ CHANGES
2.4.5 (unreleased)
------------------

- Avoid fail at field conversion when value is not send in unicode.
- Nothing changed yet.


2.4.4 (2011-07-11)
Expand Down
10 changes: 2 additions & 8 deletions src/z3c/form/converter.py
Expand Up @@ -46,10 +46,7 @@ def toFieldValue(self, value):
"""See interfaces.IDataConverter"""
if value == u'':
return self.field.missing_value
if type(value) is unicode:
return self.field.fromUnicode(value)
else:
return self.field.fromUnicode(unicode(value))
return self.field.fromUnicode(value)

def __repr__(self):
return '<%s converts from %s to %s>' %(
Expand Down Expand Up @@ -116,10 +113,7 @@ def toFieldValue(self, value):
if value == u'':
return self.field.missing_value
try:
if type(value) is unicode:
return self.formatter.parse(value)
else:
return self.formatter.parse(unicode(value))
return self.formatter.parse(value)
except zope.i18n.format.NumberParseError:
raise FormatterValidationError(self.errorMessage, value)

Expand Down

0 comments on commit f178cca

Please sign in to comment.