Skip to content
Browse files

[1.0.X] Fixed #8910 -- Added force_unicode during admin log message c…

…reation to avoid triggering a Python 2.3 bug. Thanks for the report joshg and patch nfg.

[9383] from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent df8cb50 commit 4a3dcd7f5ee56c4bd28c2fbb27465bae039e61b9 @kmtracey kmtracey committed
Showing with 4 additions and 4 deletions.
  1. +3 −3 django/contrib/admin/
  2. +1 −1 tests/regressiontests/admin_views/
6 django/contrib/admin/
@@ -342,16 +342,16 @@ def construct_change_message(self, request, form, formsets):
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.')
2 tests/regressiontests/admin_views/
@@ -76,7 +76,7 @@ def testBasicEditPost(self):
"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",

0 comments on commit 4a3dcd7

Please sign in to comment.
Something went wrong with that request. Please try again.