Changeset 3666
- Timestamp:
- 08/27/06 13:10:32 (2 years ago)
- Files:
-
- django/trunk/django/template/defaulttags.py (modified) (1 diff)
- django/trunk/django/template/__init__.py (modified) (4 diffs)
- django/trunk/django/template/loader.py (modified) (1 diff)
- django/trunk/django/template/loader_tags.py (modified) (1 diff)
- django/trunk/django/template/signals.py (deleted)
- django/trunk/django/views/debug.py (modified) (3 diffs)
- django/trunk/django/views/static.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/template/defaulttags.py
r3659 r3666 252 252 if self.parsed: 253 253 try: 254 t = Template(output , name=self.filepath)254 t = Template(output) 255 255 return t.render(context) 256 256 except TemplateSyntaxError, e: django/trunk/django/template/__init__.py
r3659 r3666 61 61 from django.utils.functional import curry 62 62 from django.utils.text import smart_split 63 from django.dispatch import dispatcher64 from django.template import signals65 63 66 64 __all__ = ('Template', 'Context', 'RequestContext', 'compile_string') … … 140 138 141 139 class Template(object): 142 def __init__(self, template_string, origin=None , name='<Unknown Template>'):140 def __init__(self, template_string, origin=None): 143 141 "Compilation stage" 144 142 if settings.TEMPLATE_DEBUG and origin == None: … … 147 145 # came from... 148 146 self.nodelist = compile_string(template_string, origin) 149 self.name = name150 147 151 148 def __iter__(self): … … 156 153 def render(self, context): 157 154 "Display stage -- can be called many times" 158 dispatcher.send(signal=signals.template_rendered, sender=self, template=self, context=context)159 155 return self.nodelist.render(context) 160 156 django/trunk/django/template/loader.py
r3659 r3666 77 77 handling template inheritance recursively. 78 78 """ 79 source, origin = find_template_source(template_name) 80 template = get_template_from_string(source, origin, template_name) 81 return template 79 return get_template_from_string(*find_template_source(template_name)) 82 80 83 def get_template_from_string(source, origin=None , name=None):81 def get_template_from_string(source, origin=None): 84 82 """ 85 83 Returns a compiled Template object for the given template code, 86 84 handling template inheritance recursively. 87 85 """ 88 return Template(source, origin , name)86 return Template(source, origin) 89 87 90 88 def render_to_string(template_name, dictionary=None, context_instance=None): django/trunk/django/template/loader_tags.py
r3659 r3666 58 58 raise TemplateSyntaxError, "Template %r cannot be extended, because it doesn't exist" % parent 59 59 else: 60 return get_template_from_string(source, origin , parent)60 return get_template_from_string(source, origin) 61 61 62 62 def render(self, context): django/trunk/django/views/debug.py
r3659 r3666 116 116 'lineno': '?', 117 117 }] 118 t = Template(TECHNICAL_500_TEMPLATE , name='Technical 500 Template')118 t = Template(TECHNICAL_500_TEMPLATE) 119 119 c = Context({ 120 120 'exception_type': exc_type.__name__, … … 142 142 return empty_urlconf(request) 143 143 144 t = Template(TECHNICAL_404_TEMPLATE , name='Technical 404 Template')144 t = Template(TECHNICAL_404_TEMPLATE) 145 145 c = Context({ 146 146 'root_urlconf': settings.ROOT_URLCONF, … … 155 155 def empty_urlconf(request): 156 156 "Create an empty URLconf 404 error response." 157 t = Template(EMPTY_URLCONF_TEMPLATE , name='Empty URLConf Template')157 t = Template(EMPTY_URLCONF_TEMPLATE) 158 158 c = Context({ 159 159 'project_name': settings.SETTINGS_MODULE.split('.')[0] django/trunk/django/views/static.py
r3659 r3666 82 82 t = loader.get_template('static/directory_index') 83 83 except TemplateDoesNotExist: 84 t = Template(DEFAULT_DIRECTORY_INDEX_TEMPLATE , name='Default Directory Index Template')84 t = Template(DEFAULT_DIRECTORY_INDEX_TEMPLATE) 85 85 files = [] 86 86 for f in os.listdir(fullpath):
