Django

Code

Show
Ignore:
Timestamp:
06/04/08 12:37:02 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7545-7546,7548-7561,7563-7565,7567-7569 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7539 to /django/trunk:1-7572

  • django/branches/gis/django/template/loader.py

    r5540 r7573  
    4747    global template_source_loaders 
    4848    if template_source_loaders is None: 
    49         template_source_loaders = [] 
     49        loaders = [] 
    5050        for path in settings.TEMPLATE_LOADERS: 
    5151            i = path.rfind('.') 
    …… 
    6363                warnings.warn("Your TEMPLATE_LOADERS setting includes %r, but your Python installation doesn't support that type of template loading. Consider removing that line from TEMPLATE_LOADERS." % path) 
    6464            else: 
    65                 template_source_loaders.append(func) 
     65                loaders.append(func) 
     66        template_source_loaders = tuple(loaders) 
    6667    for loader in template_source_loaders: 
    6768        try: