summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-03 15:18:13 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-03 15:18:13 +0200
commit9908201d7fc3340b83db21298033c5b347f38d65 (patch)
tree7ee704b3041f1d742f635a9bc4756c321621e76e /django/forms
parent2407c45c180703f935a2280cb3325beadc2ac8cc (diff)
Replaced some byte strings by str() calls
This is a useful trick when Python 2 awaits byte strings and Python 3 Unicode (regular) strings.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/formsets.py2
-rw-r--r--django/forms/models.py4
2 files changed, 3 insertions, 3 deletions
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 = {