Commit 8a58f221 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed #8078 -- Fixed a Python 2.3 incompatibility in... 

Fixed #8078 -- Fixed a Python 2.3 incompatibility in `contrib/admin/options.py`, thanks Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 351a3ca1

django/contrib/admin/options.py

+20 −17
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ from django.utils.safestring import mark_safe 
from django.utils.text import capfirst, get_text_list

from django.utils.translation import ugettext as _

from django.utils.encoding import force_unicode

import sets

try:

    set

except NameError:

    from sets import Set as set     # Python 2.3 fallback



HORIZONTAL, VERTICAL = 1, 2

# returns the <ul> class for a given radio_admin field
@@ -646,7 +649,7 @@ class ModelAdmin(BaseModelAdmin): 
        # Populate deleted_objects, a data structure of all related objects that

        # will also be deleted.

        deleted_objects = [mark_safe(u'%s: <a href="../../%s/">%s</a>' % (escape(force_unicode(capfirst(opts.verbose_name))), quote(object_id), escape(obj))), []]

        perms_needed = sets.Set()

        perms_needed = set()

        get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1, self.admin_site)



        if request.POST: # The user has already confirmed the deletion.