diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-05-04 14:00:30 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-05-04 14:00:30 +0000 |
| commit | 5211f48ae3cc0d87a260dbf5c3ab8bdae664c4b6 (patch) | |
| tree | 2b50ac06dd30395e53e7649d2a813927ccaeed94 /django/contrib/admin/views | |
| parent | 7202eb8e3194c6d9c52780526871018205bd0858 (diff) | |
Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/views')
| -rw-r--r-- | django/contrib/admin/views/decorators.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py index fc8582b1b8..afdc07589d 100644 --- a/django/contrib/admin/views/decorators.py +++ b/django/contrib/admin/views/decorators.py @@ -2,7 +2,7 @@ import base64 try: from functools import wraps except ImportError: - from django.utils.functional import wraps # Python 2.3, 2.4 fallback. + from django.utils.functional import wraps # Python 2.4 fallback. from django import http, template from django.conf import settings diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index d34bb1b195..8c09c10ab3 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -9,11 +9,6 @@ from django.utils.translation import ugettext from django.utils.http import urlencode import operator -try: - set -except NameError: - from sets import Set as set # Python 2.3 fallback - # The system will display a "Show all" link on the change list only if the # total result count is less than or equal to this setting. MAX_SHOW_ALL_ALLOWED = 200 |