diff options
| -rw-r--r-- | django/contrib/admin/actions.py | 4 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 4 | ||||
| -rw-r--r-- | django/contrib/admin/util.py | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 5cc2f811e4..8d03c6ce5a 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -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): """ diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index f349a6d169..69bc9199f6 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -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 diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py index 9f6102c6ca..e829d00eea 100644 --- a/django/contrib/admin/util.py +++ b/django/contrib/admin/util.py @@ -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 |