diff decoupage/web.py @ 65:ac1dc088e37e

add inclusion template
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 26 Oct 2011 21:21:47 -0700
parents 613ffeec2be5
children 9fac58348520
line wrap: on
line diff
--- a/decoupage/web.py	Wed Dec 15 09:30:32 2010 -0800
+++ b/decoupage/web.py	Wed Oct 26 21:21:47 2011 -0700
@@ -156,6 +156,9 @@
         files = self.filedata(path, directory, conf)
         data = {'path': path, 'files': files, 'request': request }
 
+        # add a function to get the path to files
+        data['filepath'] = lambda *segments: os.path.join(*([directory] + list(segments)))
+
         # defaults; TODO: make this better
         # there shouldn't need to be defaults;
         # iirc, genshi has a mode where these will default to None
@@ -208,8 +211,8 @@
                 if os.path.exists(_template):
                     template = _template
                 else:
-                    for directory in self.template_directories:
-                        if template in os.listdir(directory):
+                    for _directory in self.template_directories:
+                        if template in os.listdir(_directory):
                             break
                     else:
                         raise IOError("template %s not found" % template)