Changeset 1399

Timestamp:

11/24/05 15:14:42 (3 years ago)

Author:

adrian

Message:

Added a get_template_sources generator function to filesystem and app_directories template loaders, so template-loader debugger can hook into it. Refs #892.

Files:

• django/trunk/django/core/template/loader.py (modified) (1 diff)
• django/trunk/django/core/template/loaders/app_directories.py (modified) (1 diff)
• django/trunk/django/core/template/loaders/filesystem.py (modified) (1 diff)

django/trunk/django/core/template/loader.py

@@ -60 +60 @@
-    for loader in template_source_loaders:
-        try:
- 
+
-            return (source, make_origin(display_name, loader, name, dirs))
-        except TemplateDoesNotExist:

django/trunk/django/core/template/loaders/app_directories.py

@@ -28 +28 @@
-app_template_dirs = tuple(app_template_dirs)
-
+def get_template_sources(template_name, template_dirs=None):
+    for template_dir in app_template_dirs:
+        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION
+
-def load_template_source(template_name, template_dirs=None):
-
-
+
-        try:
-            return (open(filepath).read(), filepath)

django/trunk/django/core/template/loaders/filesystem.py

@@ -5 +5 @@
-import os
-
-load_template_source
+get_template_sources
-    if not template_dirs:
-        template_dirs = TEMPLATE_DIRS
+    for template_dir in template_dirs:
+        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION
+
+def load_template_source(template_name, template_dirs=None):
-    tried = []
-
-
+
-        try:
-            return (open(filepath).read(), filepath)