Changeset 7584 for django/branches/newforms-admin/django/template/loader.py
- Timestamp:
- 06/07/08 12:10:16 (7 months ago)
- Files:
-
- django/branches/newforms-admin (modified) (1 prop)
- django/branches/newforms-admin/django/template/loader.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7543 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7583
django/branches/newforms-admin/django/template/loader.py
r4265 r7584 47 47 global template_source_loaders 48 48 if template_source_loaders is None: 49 template_source_loaders = []49 loaders = [] 50 50 for path in settings.TEMPLATE_LOADERS: 51 51 i = path.rfind('.') … … 63 63 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) 64 64 else: 65 template_source_loaders.append(func) 65 loaders.append(func) 66 template_source_loaders = tuple(loaders) 66 67 for loader in template_source_loaders: 67 68 try:
