Commit dcb0e8f9 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixup for Python 2.3. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent fc4948d5

django/forms/models.py

+6 −4
Original line number Diff line number Diff line
@@ -255,16 +255,18 @@ class BaseModelForm(BaseForm): 
                    field_label = self.fields[field_name].label

                    # Insert the error into the error dict, very sneaky

                    self._errors[field_name] = ErrorList([

                        _("%(model_name)s with this %(field_label)s already exists.") % \

                        {'model_name': model_name, 'field_label': field_label}

                        _(u"%(model_name)s with this %(field_label)s already exists.") % \

                        {'model_name': unicode(model_name),

                         'field_label': unicode(field_label)}

                    ])

                # unique_together

                else:

                    field_labels = [self.fields[field_name].label for field_name in unique_check]

                    field_labels = get_text_list(field_labels, _('and'))

                    form_errors.append(

                        _("%(model_name)s with this %(field_label)s already exists.") % \

                        {'model_name': model_name, 'field_label': field_labels}

                        _(u"%(model_name)s with this %(field_label)s already exists.") % \

                        {'model_name': unicode(model_name),

                         'field_label': unicode(field_labels)}

                    )

                

                # Remove the data from the cleaned_data dict since it was invalid