Ticket #1194: filesystem.diff

__init__.py

@@ -116 +116 @@
 class TemplateDoesNotExist(Exception):
     pass
 
+class TemplateIsNotReadable(TemplateDoesNotExist):
+    # subclassed to provide backwards-compatibility in catch blocks
+    pass
+
 class VariableDoesNotExist(Exception):
 
     def __init__(self, msg, params=()):

loaders/filesystem.py

@@ -1 +1 @@
 # Wrapper for loading templates from the filesystem.
 
 from django.conf import settings
-from django.template import TemplateDoesNotExist
+from django.template import TemplateDoesNotExist, TemplateIsNotReadable
 import os
+import errno
 
 def get_template_sources(template_name, template_dirs=None):
     if not template_dirs:
@@ -12 +13 @@
 
 def load_template_source(template_name, template_dirs=None):
     tried = []
+    found = []
+    error_class = TemplateDoesNotExist
     for filepath in get_template_sources(template_name, template_dirs):
         try:
             return (open(filepath).read(), filepath)
-        except IOError:
-            tried.append(filepath)
-    if tried:
+        except IOError, (code, message):
+            if code == errno.EACCES:
+                # file exists but is unreadable
+                tried.append(filepath)
+                found.append(filepath)
+                error_class = TemplateIsNotReadable
+            else:
+                # file didn't exist, or something else happened
+                tried.append(filepath)
+
+    if found:
+        # if we found something, but it was unreadable, make a special note
+        error_msg = "Tried %s, Found unreadable %s" % (tried, found)
+    elif tried:
         error_msg = "Tried %s" % tried
     else:
         error_msg = "Your TEMPLATE_DIRS setting is empty. Change it to point to at least one template directory."
-    raise TemplateDoesNotExist, error_msg
+    raise error_class, error_msg
 load_template_source.is_usable = True