Django

Code

Changeset 1375

Show
Ignore:
Timestamp:
11/23/05 15:33:19 (3 years ago)
Author:
rjwittams
Message:

Fix #885

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/new-admin/django/core/template/loader.py

    r1372 r1375  
    2222 
    2323from django.core.exceptions import ImproperlyConfigured 
    24 from django.core.template import Origin, StringOrigin, Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, register_tag 
     24from django.core.template import Origin, StringOrigin, Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, resolve_variable, register_tag 
    2525from django.conf.settings import TEMPLATE_LOADERS, TEMPLATE_DEBUG 
    2626 
    …… 
    208208             t = get_template(template_name) 
    209209             return t.render(context) 
    210          except Exception, e: 
     210         except TemplateSyntaxError, e: 
    211211             if TEMPLATE_DEBUG: 
    212212                 raise 
     213             return '' 
     214         except: 
    213215             return '' # Fail silently for invalid included templates. 
    214216