summaryrefslogtreecommitdiff
path: root/django/forms/models.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-04-11 07:41:59 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-04-11 07:41:59 +0000
commit3bd384aa62608ca2aebdf6d86ae1a75abb96f4bf (patch)
tree2a1168b110a3802532436be0c93a8375083cfb8e /django/forms/models.py
parentd2fc8ae0e3f1a17e1e0df129431b54a9dff99638 (diff)
Fixed #10645 -- Added some robustness around some admin and modelform params.
Fieldset dictionary names, search fields and unique_together attribute names all have to be convertible to strings (that has always been true). If somebody passes in a unicode object, Python barfs because Django uses those values as keyword argument names and function calls require parameter names to be str objects. We now convert thing to strs automatically. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms/models.py')
-rw-r--r--django/forms/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py
index 8d55e4459e..010d3bf61c 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -276,7 +276,7 @@ class BaseModelForm(BaseForm):
# using it in a lookup.
if isinstance(self.fields[field_name], ModelChoiceField):
lookup_value = lookup_value.pk
- lookup_kwargs[field_name] = lookup_value
+ lookup_kwargs[str(field_name)] = lookup_value
qs = self.instance.__class__._default_manager.filter(**lookup_kwargs)