summaryrefslogtreecommitdiff
path: root/django/contrib/admin/views
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2011-03-28 01:40:43 +0000
committerAdrian Holovaty <adrian@holovaty.com>2011-03-28 01:40:43 +0000
commita87be3554fc73a567b926ea51c13ea844b5113f8 (patch)
tree4257fc86e46149314334c3c7ffdaf723f581401e /django/contrib/admin/views
parent18ef901e5f8e3e20256defd1cb42a2310ee9b64b (diff)
Removed a bunch of Python 2.4 workarounds now that we don't support it. Refs #15702 -- thanks to jonash for the patch. Splitting this over muliple commits to make it more manageable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/views')
-rw-r--r--django/contrib/admin/views/decorators.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index 9088eb0494..9fabe64a6a 100644
--- a/django/contrib/admin/views/decorators.py
+++ b/django/contrib/admin/views/decorators.py
@@ -1,8 +1,4 @@
-try:
- from functools import wraps
-except ImportError:
- from django.utils.functional import wraps # Python 2.4 fallback.
-
+from functools import wraps
from django.utils.translation import ugettext as _
from django.contrib.admin.forms import AdminAuthenticationForm
from django.contrib.auth.views import login