Django

Code

Show
Ignore:
Timestamp:
06/22/07 11:56:04 (2 years ago)
Author:
bouldersprinters
Message:

boulder-oracle-sprint: Merged to [5511]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/boulder-oracle-sprint/django/views/debug.py

    r5491 r5512  
    138138        'loader_debug_info': loader_debug_info, 
    139139    }) 
    140     return HttpResponseServerError(t.iter_render(c), mimetype='text/html') 
     140    return HttpResponseServerError(t.render(c), mimetype='text/html') 
    141141 
    142142def technical_404_response(request, exception): 
     
    161161        'settings': get_safe_settings(), 
    162162    }) 
    163     return HttpResponseNotFound(t.iter_render(c), mimetype='text/html') 
     163    return HttpResponseNotFound(t.render(c), mimetype='text/html') 
    164164 
    165165def empty_urlconf(request): 
     
    169169        'project_name': settings.SETTINGS_MODULE.split('.')[0] 
    170170    }) 
    171     return HttpResponseNotFound(t.iter_render(c), mimetype='text/html') 
     171    return HttpResponseNotFound(t.render(c), mimetype='text/html') 
    172172 
    173173def _get_lines_from_file(filename, lineno, context_lines, loader=None, module_name=None): 
  • django/branches/boulder-oracle-sprint/django/views/defaults.py

    r5491 r5512  
    7777    """ 
    7878    t = loader.get_template(template_name) # You need to create a 404.html template. 
    79     return http.HttpResponseNotFound(t.iter_render(RequestContext(request, {'request_path': request.path}))) 
     79    return http.HttpResponseNotFound(t.render(RequestContext(request, {'request_path': request.path}))) 
    8080 
    8181def server_error(request, template_name='500.html'): 
     
    8787    """ 
    8888    t = loader.get_template(template_name) # You need to create a 500.html template. 
    89     return http.HttpResponseServerError(t.iter_render(Context({}))) 
     89    return http.HttpResponseServerError(t.render(Context({}))) 
  • django/branches/boulder-oracle-sprint/django/views/generic/create_update.py

    r5491 r5512  
    6969        else: 
    7070            c[key] = value 
    71     return HttpResponse(t.iter_render(c)) 
     71    return HttpResponse(t.render(c)) 
    7272 
    7373def update_object(request, model, object_id=None, slug=None, 
     
    142142        else: 
    143143            c[key] = value 
    144     response = HttpResponse(t.iter_render(c)) 
     144    response = HttpResponse(t.render(c)) 
    145145    populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) 
    146146    return response 
     
    196196            else: 
    197197                c[key] = value 
    198         response = HttpResponse(t.iter_render(c)) 
     198        response = HttpResponse(t.render(c)) 
    199199        populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) 
    200200        return response 
  • django/branches/boulder-oracle-sprint/django/views/generic/date_based.py

    r5491 r5512  
    4545        else: 
    4646            c[key] = value 
    47     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     47    return HttpResponse(t.render(c), mimetype=mimetype) 
    4848 
    4949def archive_year(request, year, queryset, date_field, template_name=None, 
     
    9393        else: 
    9494            c[key] = value 
    95     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     95    return HttpResponse(t.render(c), mimetype=mimetype) 
    9696 
    9797def archive_month(request, year, month, queryset, date_field, 
     
    159159        else: 
    160160            c[key] = value 
    161     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     161    return HttpResponse(t.render(c), mimetype=mimetype) 
    162162 
    163163def archive_week(request, year, week, queryset, date_field, 
     
    207207        else: 
    208208            c[key] = value 
    209     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     209    return HttpResponse(t.render(c), mimetype=mimetype) 
    210210 
    211211def archive_day(request, year, month, day, queryset, date_field, 
     
    271271        else: 
    272272            c[key] = value 
    273     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     273    return HttpResponse(t.render(c), mimetype=mimetype) 
    274274 
    275275def archive_today(request, **kwargs): 
     
    340340        else: 
    341341            c[key] = value 
    342     response = HttpResponse(t.iter_render(c), mimetype=mimetype) 
     342    response = HttpResponse(t.render(c), mimetype=mimetype) 
    343343    populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) 
    344344    return response 
  • django/branches/boulder-oracle-sprint/django/views/generic/list_detail.py

    r5491 r5512  
    8585        template_name = "%s/%s_list.html" % (model._meta.app_label, model._meta.object_name.lower()) 
    8686    t = template_loader.get_template(template_name) 
    87     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     87    return HttpResponse(t.render(c), mimetype=mimetype) 
    8888 
    8989def object_detail(request, queryset, object_id=None, slug=None, 
     
    127127        else: 
    128128            c[key] = value 
    129     response = HttpResponse(t.iter_render(c), mimetype=mimetype) 
     129    response = HttpResponse(t.render(c), mimetype=mimetype) 
    130130    populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) 
    131131    return response 
  • django/branches/boulder-oracle-sprint/django/views/generic/simple.py

    r5491 r5512  
    1616    c = RequestContext(request, dictionary) 
    1717    t = loader.get_template(template) 
    18     return HttpResponse(t.iter_render(c), mimetype=mimetype) 
     18    return HttpResponse(t.render(c), mimetype=mimetype) 
    1919 
    2020def redirect_to(request, url, **kwargs): 
  • django/branches/boulder-oracle-sprint/django/views/static.py

    r5491 r5512  
    9393        'file_list' : files, 
    9494    }) 
    95     return HttpResponse(t.iter_render(c)) 
     95    return HttpResponse(t.render(c)) 
    9696 
    9797def was_modified_since(header=None, mtime=0, size=0):