From 42dec1ef7598a418747637dd37319b81c5a6367f Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 27 Feb 2006 05:16:24 +0000 Subject: [PATCH] magic-removal: Renamed 'object' to 'obj' local variable in date-based and list-detail generic views, so as not to override the Python builtin 'object' git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2405 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/views/generic/date_based.py | 8 ++++---- django/views/generic/list_detail.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/django/views/generic/date_based.py b/django/views/generic/date_based.py index 05d3e27ede..bfb6c42882 100644 --- a/django/views/generic/date_based.py +++ b/django/views/generic/date_based.py @@ -225,18 +225,18 @@ def object_detail(request, year, month, day, queryset, date_field, else: raise AttributeError, "Generic detail view must be called with either an object_id or a slug/slugfield" try: - object = queryset.get(**lookup_kwargs) + obj = queryset.get(**lookup_kwargs) except ObjectDoesNotExist: raise Http404, "No %s found for" % model._meta.verbose_name if not template_name: template_name = "%s/%s_detail" % (model._meta.app_label, model._meta.object_name.lower()) if template_name_field: - template_name_list = [getattr(object, template_name_field), template_name] + template_name_list = [getattr(obj, template_name_field), template_name] t = template_loader.select_template(template_name_list) else: t = template_loader.get_template(template_name) c = RequestContext(request, { - 'object': object, + 'object': obj, }, context_processors) for key, value in extra_context.items(): if callable(value): @@ -244,5 +244,5 @@ def object_detail(request, year, month, day, queryset, date_field, else: c[key] = value response = HttpResponse(t.render(c)) - populate_xheaders(request, response, model, getattr(object, object._meta.pk.name)) + populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) return response diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py index 173cb61c74..a7d2204127 100644 --- a/django/views/generic/list_detail.py +++ b/django/views/generic/list_detail.py @@ -95,18 +95,18 @@ def object_detail(request, queryset, object_id=None, slug=None, else: raise AttributeError, "Generic detail view must be called with either an object_id or a slug/slug_field." try: - object = queryset.get() + obj = queryset.get() except ObjectDoesNotExist: raise Http404, "No %s found matching the query" % (model._meta.verbose_name) if not template_name: template_name = "%s/%s_detail" % (model._meta.app_label, model._meta.object_name.lower()) if template_name_field: - template_name_list = [getattr(object, template_name_field), template_name] + template_name_list = [getattr(obj, template_name_field), template_name] t = template_loader.select_template(template_name_list) else: t = template_loader.get_template(template_name) c = RequestContext(request, { - 'object': object, + 'object': obj, }, context_processors) for key, value in extra_context.items(): if callable(value): @@ -114,5 +114,5 @@ def object_detail(request, queryset, object_id=None, slug=None, else: c[key] = value response = HttpResponse(t.render(c)) - populate_xheaders(request, response, model, getattr(object, object._meta.pk.name)) + populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) return response