From 9908201d7fc3340b83db21298033c5b347f38d65 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 3 Aug 2012 15:18:13 +0200 Subject: Replaced some byte strings by str() calls This is a useful trick when Python 2 awaits byte strings and Python 3 Unicode (regular) strings. --- django/forms/formsets.py | 2 +- django/forms/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'django/forms') diff --git a/django/forms/formsets.py b/django/forms/formsets.py index 240cf71f43..1ec8340462 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -365,7 +365,7 @@ def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, attrs = {'form': form, 'extra': extra, 'can_order': can_order, 'can_delete': can_delete, 'max_num': max_num} - return type(form.__name__ + b'FormSet', (formset,), attrs) + return type(form.__name__ + str('FormSet'), (formset,), attrs) def all_valid(formsets): """Returns true if every formset in formsets is valid.""" diff --git a/django/forms/models.py b/django/forms/models.py index 4d56f1d38a..b5939b6be3 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -389,10 +389,10 @@ def modelform_factory(model, form=ModelForm, fields=None, exclude=None, parent = (object,) if hasattr(form, 'Meta'): parent = (form.Meta, object) - Meta = type(b'Meta', parent, attrs) + Meta = type(str('Meta'), parent, attrs) # Give this new form class a reasonable name. - class_name = model.__name__ + b'Form' + class_name = model.__name__ + str('Form') # Class attributes for the new form class. form_class_attrs = { -- cgit v1.3