Fixed #1041 -- Generic views no longer use deprecated template_loader. Thanks for the patch, Ian

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1684 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 6 deletions

diff --git a/django/views/generic/date_based.py b/django/views/generic/date_based.py
index ca4b4b86e3..eb7386daf3 100644
--- a/django/views/generic/date_based.py
+++ b/django/views/generic/date_based.py
@@ -1,4 +1,4 @@
-from django.core import template_loader
+from django.core.template import loader
 from django.core.exceptions import Http404, ObjectDoesNotExist
 from django.core.extensions import DjangoContext as Context
 from django.core.xheaders import populate_xheaders
@@ -7,7 +7,7 @@ from django.utils.httpwrappers import HttpResponse
 import datetime, time
 
 def archive_index(request, app_label, module_name, date_field, num_latest=15,
-                  template_name=None, template_loader=template_loader,
+                  template_name=None, template_loader=loader,
                   extra_lookup_kwargs={}, extra_context={}, allow_empty=False):
     """
     Generic top-level archive of date-based objects.
@@ -50,7 +50,7 @@ def archive_index(request, app_label, module_name, date_field, num_latest=15,
     return HttpResponse(t.render(c))
 
 def archive_year(request, year, app_label, module_name, date_field,
-                 template_name=None, template_loader=template_loader,
+                 template_name=None, template_loader=loader,
                  extra_lookup_kwargs={}, extra_context={}):
     """
     Generic yearly archive view.
@@ -87,7 +87,7 @@ def archive_year(request, year, app_label, module_name, date_field,
     return HttpResponse(t.render(c))
 
 def archive_month(request, year, month, app_label, module_name, date_field,
-                  month_format='%b', template_name=None, template_loader=template_loader,
+                  month_format='%b', template_name=None, template_loader=loader,
                   extra_lookup_kwargs={}, extra_context={}):
     """
     Generic monthly archive view.
@@ -136,7 +136,7 @@ def archive_month(request, year, month, app_label, module_name, date_field,
 
 def archive_day(request, year, month, day, app_label, module_name, date_field,
                 month_format='%b', day_format='%d', template_name=None,
-                template_loader=template_loader, extra_lookup_kwargs={},
+                template_loader=loader, extra_lookup_kwargs={},
                 extra_context={}, allow_empty=False):
     """
     Generic daily archive view.
@@ -200,7 +200,7 @@ def archive_today(request, **kwargs):
 def object_detail(request, year, month, day, app_label, module_name, date_field,
                   month_format='%b', day_format='%d', object_id=None, slug=None,
                   slug_field=None, template_name=None, template_name_field=None,
-                  template_loader=template_loader, extra_lookup_kwargs={},
+                  template_loader=loader, extra_lookup_kwargs={},
                   extra_context={}):
     """
     Generic detail view from year/month/day/slug or year/month/day/id structure.