Author: kmtracey
Date: 2010-02-26 08:24:08 -0600 (Fri, 26 Feb 2010)
New Revision: 12601
Modified:
django/branches/releases/1.1.X/django/contrib/admin/actions.py
django/branches/releases/1.1.X/django/contrib/admin/options.py
django/branches/releases/1.1.X/django/contrib/admin/util.py
Log:
[1.1.X] Python 2.3 compatibility: moved the fallback import for set to where
set() is now used.
Modified: django/branches/releases/1.1.X/django/contrib/admin/actions.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/actions.py
2010-02-26 13:43:28 UTC (rev 12600)
+++ django/branches/releases/1.1.X/django/contrib/admin/actions.py
2010-02-26 14:24:08 UTC (rev 12601)
@@ -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):
"""
Modified: django/branches/releases/1.1.X/django/contrib/admin/options.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/options.py
2010-02-26 13:43:28 UTC (rev 12600)
+++ django/branches/releases/1.1.X/django/contrib/admin/options.py
2010-02-26 14:24:08 UTC (rev 12601)
@@ -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
Modified: django/branches/releases/1.1.X/django/contrib/admin/util.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/util.py 2010-02-26
13:43:28 UTC (rev 12600)
+++ django/branches/releases/1.1.X/django/contrib/admin/util.py 2010-02-26
14:24:08 UTC (rev 12601)
@@ -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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
