Changeset 22

Show
Ignore:
Timestamp:
Mon Jan 30 09:31:08 2006
Author:
rdelon
Message:

Fixed potential cache bug (include path in cache key)

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/cherrytemplate.py

    r21 r22  
    451 451         raise InternalError(minTag)  
    452 452  
    453   def render(template = '', file = None, input_encoding = None, output_encoding = None, output_encoding_errors = None, return_generator = None, glob = None, loc = None, log_func = None, path = []):  
      453 def render(template = '', file = None, input_encoding = None,  
      454         output_encoding = None, output_encoding_errors = None,  
      455         return_generator = None, glob = None, loc = None,  
      456         log_func = None, path = []):  
    454 457     path += globals()['path']  
    455 458     # print "* Rendering:", file  
    456 459     t0 = time.time()  
    457 460  
    458       cache_key = template or file  
    459       _original_template, _expanded_template, _compiled_template = _cache.get(cache_key, (None, None, None))  
      461     cache_key = (template or (file, path))  
      462     _original_template, _expanded_template, _compiled_template = \  
      463             _cache.get(cache_key, (None, None, None))  
    460 464  
    461 465     if not _compiled_template:  
    …… 
    491 495  
    492 496         if use_caching:  
    493               _cache[cache_key] = _original_template, _expanded_template, _compiled_template  
      497             _cache[cache_key] = (_original_template, _expanded_template,  
      498                     _compiled_template)  
    494 499  
    495 500     if loc is None: