Changeset 9383

Timestamp:

11/10/08 11:13:41 (2 months ago)

Author:

kmtracey

Message:

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.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_views/tests.py (modified) (1 diff)

django/trunk/django/contrib/admin/options.py

@@ -343 +343 @@
-                    change_message.append(_('Added %(name)s "%(object)s".')
-                                          % {'name': added_object._meta.verbose_name,
-added_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,
-changed_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,
-deleted_object
+force_unicode(deleted_object)
-        change_message = ' '.join(change_message)
-        return change_message or _('No fields changed.')

django/trunk/tests/regressiontests/admin_views/tests.py

@@ -77 +77 @@
-            # there is no title in database, give one here or formset
-            # will fail.
-eed a title.
+orske bostaver æøå skaper problemer
-            "article_set-0-content": u"<p>Middle content</p>",
-            "article_set-0-date_0": u"2008-03-18",