diff options
Diffstat (limited to 'django/shortcuts/__init__.py')
| -rw-r--r-- | django/shortcuts/__init__.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/django/shortcuts/__init__.py b/django/shortcuts/__init__.py index 76d54917ad..3a0f6a0091 100644 --- a/django/shortcuts/__init__.py +++ b/django/shortcuts/__init__.py @@ -4,20 +4,29 @@ from django.template import loader from django.http import HttpResponse, Http404 - +from django.db.models.manager import Manager def render_to_response(*args, **kwargs): - return HttpResponse(loader.render_to_string(*args, **kwargs)) + return HttpResponse(loader.render_to_iter(*args, **kwargs)) load_and_render = render_to_response # For backwards compatibility. def get_object_or_404(klass, *args, **kwargs): + if isinstance(klass, Manager): + manager = klass + klass = manager.model + else: + manager = klass._default_manager try: - return klass._default_manager.get(*args, **kwargs) + return manager.get(*args, **kwargs) except klass.DoesNotExist: - raise Http404 + raise Http404('No %s matches the given query.' % klass._meta.object_name) def get_list_or_404(klass, *args, **kwargs): - obj_list = list(klass._default_manager.filter(*args, **kwargs)) + if isinstance(klass, Manager): + manager = klass + else: + manager = klass._default_manager + obj_list = list(manager.filter(*args, **kwargs)) if not obj_list: - raise Http404 + raise Http404('No %s matches the given query.' % manager.model._meta.object_name) return obj_list |