diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-11-10 17:26:13 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-11-10 17:26:13 +0000 |
| commit | 4a3dcd7f5ee56c4bd28c2fbb27465bae039e61b9 (patch) | |
| tree | 341e0f38919c82afe4912251f8dd5be10a7651d3 | |
| parent | df8cb5016dd423e24f6afc9c849176493db735eb (diff) | |
[1.0.X] Fixed #8910 -- Added force_unicode during admin log message creation to avoid triggering a Python 2.3 bug. Thanks for the report joshg and patch nfg.
[9383] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 6 | ||||
| -rw-r--r-- | tests/regressiontests/admin_views/tests.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b3aa3cc501..3d60b9ddf4 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -342,16 +342,16 @@ class ModelAdmin(BaseModelAdmin): for added_object in formset.new_objects: change_message.append(_('Added %(name)s "%(object)s".') % {'name': added_object._meta.verbose_name, - 'object': added_object}) + 'object': force_unicode(added_object)}) for changed_object, changed_fields in formset.changed_objects: change_message.append(_('Changed %(list)s for %(name)s "%(object)s".') % {'list': get_text_list(changed_fields, _('and')), 'name': changed_object._meta.verbose_name, - 'object': changed_object}) + 'object': force_unicode(changed_object)}) for deleted_object in formset.deleted_objects: change_message.append(_('Deleted %(name)s "%(object)s".') % {'name': deleted_object._meta.verbose_name, - 'object': deleted_object}) + 'object': force_unicode(deleted_object)}) change_message = ' '.join(change_message) return change_message or _('No fields changed.') diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index 4a568279e7..bf2c3f31a6 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -76,7 +76,7 @@ class AdminViewBasicTest(TestCase): "article_set-0-id": u"1", # there is no title in database, give one here or formset # will fail. - "article_set-0-title": u"Need a title.", + "article_set-0-title": u"Norske bostaver æøå skaper problemer", "article_set-0-content": u"<p>Middle content</p>", "article_set-0-date_0": u"2008-03-18", "article_set-0-date_1": u"11:54:58", |