diff options
Diffstat (limited to 'django/views')
| -rw-r--r-- | django/views/debug.py | 6 | ||||
| -rw-r--r-- | django/views/defaults.py | 4 | ||||
| -rw-r--r-- | django/views/generic/create_update.py | 6 | ||||
| -rw-r--r-- | django/views/generic/date_based.py | 12 | ||||
| -rw-r--r-- | django/views/generic/list_detail.py | 4 | ||||
| -rw-r--r-- | django/views/generic/simple.py | 2 | ||||
| -rw-r--r-- | django/views/static.py | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/django/views/debug.py b/django/views/debug.py index 75b1a26af9..a534f17b33 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -137,7 +137,7 @@ def technical_500_response(request, exc_type, exc_value, tb): 'template_does_not_exist': template_does_not_exist, 'loader_debug_info': loader_debug_info, }) - return HttpResponseServerError(t.iter_render(c), mimetype='text/html') + return HttpResponseServerError(t.render(c), mimetype='text/html') def technical_404_response(request, exception): "Create a technical 404 error response. The exception should be the Http404." @@ -160,7 +160,7 @@ def technical_404_response(request, exception): 'request_protocol': request.is_secure() and "https" or "http", 'settings': get_safe_settings(), }) - return HttpResponseNotFound(t.iter_render(c), mimetype='text/html') + return HttpResponseNotFound(t.render(c), mimetype='text/html') def empty_urlconf(request): "Create an empty URLconf 404 error response." @@ -168,7 +168,7 @@ def empty_urlconf(request): c = Context({ 'project_name': settings.SETTINGS_MODULE.split('.')[0] }) - return HttpResponseNotFound(t.iter_render(c), mimetype='text/html') + return HttpResponseNotFound(t.render(c), mimetype='text/html') def _get_lines_from_file(filename, lineno, context_lines, loader=None, module_name=None): """ diff --git a/django/views/defaults.py b/django/views/defaults.py index aea54c963f..701aebabd6 100644 --- a/django/views/defaults.py +++ b/django/views/defaults.py @@ -76,7 +76,7 @@ def page_not_found(request, template_name='404.html'): The path of the requested URL (e.g., '/app/pages/bad_page/') """ t = loader.get_template(template_name) # You need to create a 404.html template. - return http.HttpResponseNotFound(t.iter_render(RequestContext(request, {'request_path': request.path}))) + return http.HttpResponseNotFound(t.render(RequestContext(request, {'request_path': request.path}))) def server_error(request, template_name='500.html'): """ @@ -86,4 +86,4 @@ def server_error(request, template_name='500.html'): Context: None """ t = loader.get_template(template_name) # You need to create a 500.html template. - return http.HttpResponseServerError(t.iter_render(Context({}))) + return http.HttpResponseServerError(t.render(Context({}))) diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py index d1b8e34037..28987f7544 100644 --- a/django/views/generic/create_update.py +++ b/django/views/generic/create_update.py @@ -68,7 +68,7 @@ def create_object(request, model, template_name=None, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c)) + return HttpResponse(t.render(c)) def update_object(request, model, object_id=None, slug=None, slug_field=None, template_name=None, template_loader=loader, @@ -141,7 +141,7 @@ def update_object(request, model, object_id=None, slug=None, c[key] = value() else: c[key] = value - response = HttpResponse(t.iter_render(c)) + response = HttpResponse(t.render(c)) populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) return response @@ -195,6 +195,6 @@ def delete_object(request, model, post_delete_redirect, c[key] = value() else: c[key] = value - response = HttpResponse(t.iter_render(c)) + response = HttpResponse(t.render(c)) populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) return response diff --git a/django/views/generic/date_based.py b/django/views/generic/date_based.py index d4941388dd..d13c0293be 100644 --- a/django/views/generic/date_based.py +++ b/django/views/generic/date_based.py @@ -44,7 +44,7 @@ def archive_index(request, queryset, date_field, num_latest=15, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def archive_year(request, year, queryset, date_field, template_name=None, template_loader=loader, extra_context=None, allow_empty=False, @@ -92,7 +92,7 @@ def archive_year(request, year, queryset, date_field, template_name=None, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def archive_month(request, year, month, queryset, date_field, month_format='%b', template_name=None, template_loader=loader, @@ -158,7 +158,7 @@ def archive_month(request, year, month, queryset, date_field, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def archive_week(request, year, week, queryset, date_field, template_name=None, template_loader=loader, @@ -206,7 +206,7 @@ def archive_week(request, year, week, queryset, date_field, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def archive_day(request, year, month, day, queryset, date_field, month_format='%b', day_format='%d', template_name=None, @@ -270,7 +270,7 @@ def archive_day(request, year, month, day, queryset, date_field, c[key] = value() else: c[key] = value - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def archive_today(request, **kwargs): """ @@ -339,6 +339,6 @@ def object_detail(request, year, month, day, queryset, date_field, c[key] = value() else: c[key] = value - response = HttpResponse(t.iter_render(c), mimetype=mimetype) + response = HttpResponse(t.render(c), mimetype=mimetype) 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 b2a68d61f1..16d55202da 100644 --- a/django/views/generic/list_detail.py +++ b/django/views/generic/list_detail.py @@ -84,7 +84,7 @@ def object_list(request, queryset, paginate_by=None, page=None, model = queryset.model template_name = "%s/%s_list.html" % (model._meta.app_label, model._meta.object_name.lower()) t = template_loader.get_template(template_name) - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def object_detail(request, queryset, object_id=None, slug=None, slug_field=None, template_name=None, template_name_field=None, @@ -126,6 +126,6 @@ def object_detail(request, queryset, object_id=None, slug=None, c[key] = value() else: c[key] = value - response = HttpResponse(t.iter_render(c), mimetype=mimetype) + response = HttpResponse(t.render(c), mimetype=mimetype) populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) return response diff --git a/django/views/generic/simple.py b/django/views/generic/simple.py index f4afb07aa0..69a494931e 100644 --- a/django/views/generic/simple.py +++ b/django/views/generic/simple.py @@ -15,7 +15,7 @@ def direct_to_template(request, template, extra_context={}, mimetype=None, **kwa dictionary[key] = value c = RequestContext(request, dictionary) t = loader.get_template(template) - return HttpResponse(t.iter_render(c), mimetype=mimetype) + return HttpResponse(t.render(c), mimetype=mimetype) def redirect_to(request, url, **kwargs): """ diff --git a/django/views/static.py b/django/views/static.py index 1e99c8c50a..3ec4ca14a1 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -92,7 +92,7 @@ def directory_index(path, fullpath): 'directory' : path + '/', 'file_list' : files, }) - return HttpResponse(t.iter_render(c)) + return HttpResponse(t.render(c)) def was_modified_since(header=None, mtime=0, size=0): """ |