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, 5 insertions, 4 deletions

diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py
index 87f78c5930..da15bd1a43 100644
--- a/django/views/generic/create_update.py
+++ b/django/views/generic/create_update.py
@@ -1,6 +1,7 @@
 from django import models
 from django.core.xheaders import populate_xheaders
-from django.core import template_loader, formfields, meta
+from django.core.template import loader
+from django.core import formfields, meta
 from django.views.auth.login import redirect_to_login
 from django.core.extensions import DjangoContext as Context
 from django.core.paginator import ObjectPaginator, InvalidPage
@@ -8,7 +9,7 @@ from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect
 from django.core.exceptions import Http404, ObjectDoesNotExist, ImproperlyConfigured
 
 def create_object(request, app_label, module_name, template_name=None,
-                 template_loader=template_loader, extra_context={},
+                 template_loader=loader, extra_context={},
                  post_save_redirect=None, login_required=False, follow=None):
     """
     Generic object-creation function.
@@ -70,7 +71,7 @@ def create_object(request, app_label, module_name, template_name=None,
     return HttpResponse(t.render(c))
 
 def update_object(request, app_label, module_name, object_id=None, slug=None,
-                  slug_field=None, template_name=None, template_loader=template_loader,
+                  slug_field=None, template_name=None, template_loader=loader,
                   extra_lookup_kwargs={}, extra_context={}, post_save_redirect=None,
                   login_required=False, follow=None):
     """
@@ -145,7 +146,7 @@ def update_object(request, app_label, module_name, object_id=None, slug=None,
 
 def delete_object(request, app_label, module_name, post_delete_redirect,
                   object_id=None, slug=None, slug_field=None, template_name=None,
-                  template_loader=template_loader, extra_lookup_kwargs={},
+                  template_loader=loader, extra_lookup_kwargs={},
                   extra_context={}, login_required=False):
     """
     Generic object-delete function.