Django

Code

Changeset 930

Show
Ignore:
Timestamp:
10/18/05 00:18:50 (3 years ago)
Author:
adrian
Message:

Changed django.contrib.admin.views.main to use template.loader instead of template_loader

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/views/main.py

    r927 r930  
    11# Generic admin views, with admin templates created dynamically at runtime. 
    22 
    3 from django.core import formfields, meta, template_loader 
     3from django.core import formfields, meta 
     4from django.core.template import loader 
    45from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied 
    56from django.core.extensions import DjangoContext as Context 
    …… 
    487488    raw_template.append('</div>\n</div>') 
    488489    raw_template.append('{% endblock %}\n') 
    489     t = template_loader.get_template_from_string(''.join(raw_template)) 
     490    t = loader.get_template_from_string(''.join(raw_template)) 
    490491    c = Context(request, { 
    491492        'title': (is_popup and 'Select %s' % opts.verbose_name or 'Select %s to change' % opts.verbose_name), 
    …… 
    851852    raw_template = _get_template(opts, app_label, add=True, show_delete=show_delete, form_url=form_url) 
    852853#     return HttpResponse(raw_template, mimetype='text/plain') 
    853     t = template_loader.get_template_from_string(raw_template) 
     854    t = loader.get_template_from_string(raw_template) 
    854855    return HttpResponse(t.render(c)) 
    855856 
    …… 
    976977    raw_template = _get_template(opts, app_label, change=True) 
    977978#     return HttpResponse(raw_template, mimetype='text/plain') 
    978     t = template_loader.get_template_from_string(raw_template) 
     979    t = loader.get_template_from_string(raw_template) 
    979980    return HttpResponse(t.render(c)) 
    980981