Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Python 2.3 compatibility: moved the fallback import for set t…

…o 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
  • Loading branch information...
commit 0c2d3ff7a12916f8de06af845abd552bf43be009 1 parent 3bda1f5
@kmtracey kmtracey authored
View
4 django/contrib/admin/actions.py
@@ -12,10 +12,6 @@
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):
"""
View
4 django/contrib/admin/options.py
@@ -20,10 +20,6 @@
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
View
5 django/contrib/admin/util.py
@@ -9,6 +9,11 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.