Fixed FileSystemBytecodeCache.clear

--HG--
branch : trunk

diff --git a/jinja2/bccache.py b/jinja2/bccache.py
index ff3dd69325c6544cf36c82d9ab8a1258284db541..149c0c01eaaf75ecd26d2db7a336c65be8e76269 100644 (file)
--- a/jinja2/bccache.py
+++ b/jinja2/bccache.py
@@ -208,7 +208,8 @@ class FileSystemBytecodeCache(BytecodeCache):
             f.close()
 
     def clear(self):
-        for filename in filter(listdir(self.directory), self.pattern % '*'):
+        files = fnmatch.filter(listdir(self.directory), self.pattern % '*')
+        for filename in files:
             try:
                 remove(path.join(self.directory, filename))
             except OSError:

diff --git a/jinja2/loaders.py b/jinja2/loaders.py
index dff95f7386bf0a952f1ea6a115eb764acf48ef60..264b12385d9a96f7039f9a9567381682a535668f 100644 (file)
--- a/jinja2/loaders.py
+++ b/jinja2/loaders.py
@@ -211,7 +211,7 @@ class DictLoader(BaseLoader):
     def get_source(self, environment, template):
         if template in self.mapping:
             source = self.mapping[template]
-            return source, None, lambda: source != self.mapping[template]
+            return source, None, lambda: source != self.mapping.get(template)
         raise TemplateNotFound(template)