newforms UnicodeDecodeError when displaying ValidationError strings in unicode

[Mike Maravillo <maravillo@…>]

UnicodeDecodeError at /users/add_edit/1/
'ascii' codec can't decode byte 0xe3 in position 26: ordinal not in range(128)
Request Method: 	POST
Request URL: 	http://192.168.0.1:8080/users/add_edit/1/
Exception Type: 	UnicodeDecodeError
Exception Value: 	'ascii' codec can't decode byte 0xe3 in position 26: ordinal not in range(128)
Exception Location: 	/usr/lib/python2.3/site-packages/django/newforms/forms.py in _html_output, line 147
Python Executable: 	/usr/bin/python
Python Version: 	2.3.4

I'm getting the above error with the following code, when secret != secret2...

    def clean_password(self):
        if self.data['secret'] != self.data['secret2']:
            raise forms.ValidationError(_('Passwords are not the same'))
        return self.data['secret']

    def clean(self,*args, **kwargs):
        self.clean_password()
        return super(UserForm, self).clean(*args, **kwargs)

The attached patch is just a quick fix. I'm not really sure if this affects anything else since I'm just new to Django... Thanks.

[Mike Maravillo <maravillo@…>]

newforms patch

[Thomas Güttler <hv@…>]

force_unicode() is better than unicode() here. Some lines above this is used, too.

[Malcolm Tredinnick]

(In [7186]) Fixed #5811 -- Added an explicit conversion to unicode that was otherwise causing problems in some cases. Thanks, Mike Maravillo.