Removed a bunch of Python 2.4 workarounds now that we don't support it. Refs... (a87be355) · Commits · Dom Sekotill / django

django/contrib/admin/options.py

+5 −6

Original line number	Diff line number	Diff line
		from functools import update_wrapper, partial
		from django import forms, template
		from django.forms.formsets import all_valid
		from django.forms.models import (modelform_factory, modelformset_factory,
		@@ -17,10 +18,8 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect
		from django.shortcuts import get_object_or_404, render_to_response
		from django.utils.decorators import method_decorator
		from django.utils.datastructures import SortedDict
		from django.utils.functional import update_wrapper
		from django.utils.html import escape, escapejs
		from django.utils.safestring import mark_safe
		from django.utils.functional import curry
		from django.utils.text import capfirst, get_text_list
		from django.utils.translation import ugettext as _
		from django.utils.translation import ungettext
		@@ -426,7 +425,7 @@ class ModelAdmin(BaseModelAdmin):
		"form": self.form,
		"fields": fields,
		"exclude": exclude,
		"formfield_callback": curry(self.formfield_for_dbfield, request=request),
		"formfield_callback": partial(self.formfield_for_dbfield, request=request),
		}
		defaults.update(kwargs)
		return modelform_factory(self.model, **defaults)
		@@ -457,7 +456,7 @@ class ModelAdmin(BaseModelAdmin):
		Returns a Form class for use in the Formset on the changelist page.
		"""
		defaults = {
		"formfield_callback": curry(self.formfield_for_dbfield, request=request),
		"formfield_callback": partial(self.formfield_for_dbfield, request=request),
		}
		defaults.update(kwargs)
		return modelform_factory(self.model, **defaults)
		@@ -468,7 +467,7 @@ class ModelAdmin(BaseModelAdmin):
		is used.
		"""
		defaults = {
		"formfield_callback": curry(self.formfield_for_dbfield, request=request),
		"formfield_callback": partial(self.formfield_for_dbfield, request=request),
		}
		defaults.update(kwargs)
		return modelformset_factory(self.model,
		@@ -1327,7 +1326,7 @@ class InlineModelAdmin(BaseModelAdmin):
		"fk_name": self.fk_name,
		"fields": fields,
		"exclude": exclude,
		"formfield_callback": curry(self.formfield_for_dbfield, request=request),
		"formfield_callback": partial(self.formfield_for_dbfield, request=request),
		"extra": self.extra,
		"max_num": self.max_num,
		"can_delete": self.can_delete,

django/contrib/admin/sites.py

+1 −1

Original line number	Diff line number	Diff line
		import re
		from functools import update_wrapper
		from django import http, template
		from django.contrib.admin import ModelAdmin, actions
		from django.contrib.admin.forms import AdminAuthenticationForm
		@@ -9,7 +10,6 @@ from django.db.models.base import ModelBase
		from django.core.exceptions import ImproperlyConfigured
		from django.core.urlresolvers import reverse
		from django.shortcuts import render_to_response
		from django.utils.functional import update_wrapper
		from django.utils.safestring import mark_safe
		from django.utils.text import capfirst
		from django.utils.translation import ugettext as _

django/contrib/admin/views/decorators.py

+1 −5

Original line number	Diff line number	Diff line
		try:
		from functools import wraps
		except ImportError:
		from django.utils.functional import wraps # Python 2.4 fallback.

		from django.utils.translation import ugettext as _
		from django.contrib.admin.forms import AdminAuthenticationForm
		from django.contrib.auth.views import login

django/contrib/admin/widgets.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,7 @@
		Form Widget classes specific to the Django admin site.
		"""

		import django.utils.copycompat as copy

		import copy
		from django import forms
		from django.forms.widgets import RadioFieldRenderer
		from django.forms.util import flatatt

django/contrib/auth/decorators.py

+1 −5

Original line number	Diff line number	Diff line
		import urlparse
		try:
		from functools import wraps
		except ImportError:
		from django.utils.functional import wraps # Python 2.4 fallback.

		from django.conf import settings
		from django.contrib.auth import REDIRECT_FIELD_NAME
		from django.utils.decorators import available_attrs