From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 17 Sep 2008 20:25:04 +0000 (+0200)
Subject: Fixed FileSystemBytecodeCache.clear
X-Git-Tag: 2.1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e46a5c1744067b2c05f7ae55d4f606748443a5c;p=thirdparty%2Fjinja.git

Fixed FileSystemBytecodeCache.clear

--HG--
branch : trunk
---

diff --git a/jinja2/bccache.py b/jinja2/bccache.py
index ff3dd693..149c0c01 100644
--- 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 dff95f73..264b1238 100644
--- 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)