Commit 0c2d3ff7 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Python 2.3 compatibility: moved the fallback import for set to where set() is now used. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3bda1f5b

django/contrib/admin/actions.py

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ from django.utils.html import escape 
from django.utils.safestring import mark_safe

from django.utils.text import capfirst

from django.utils.translation import ugettext_lazy, ugettext as _

try:

    set

except NameError:

    from sets import Set as set     # Python 2.3 fallback



def delete_selected(modeladmin, request, queryset):

    """

django/contrib/admin/options.py

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ from django.utils.text import capfirst, get_text_list 
from django.utils.translation import ugettext as _

from django.utils.translation import ungettext, ugettext_lazy

from django.utils.encoding import force_unicode

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

django/contrib/admin/util.py

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ from django.core.urlresolvers import reverse, NoReverseMatch 


from django.utils.datastructures import SortedDict



try:

    set

except NameError:

    from sets import Set as set     # Python 2.3 fallback



def quote(s):

    """

    Ensure that primary key values do not confuse the admin URLs by escaping