Permalink
Browse files

Merge remote branch 'thomo/master' into mthomo

  • Loading branch information...
benoitc committed Dec 8, 2009
2 parents 34828d0 + a315955 commit 575c2d849869b2d4833b918c35b1085d5e6dad5a
Showing with 2 additions and 2 deletions.
  1. +2 −2 couchapp/macros.py
View
@@ -51,7 +51,7 @@ def apply_lib(doc, funcs, app_dir, objs, ui):
def run_code_macros(f_string, app_dir, ui):
def rreq(mo):
# just read the file and return it
- path = os.path.join(app_dir, mo.group(2).strip(' '))
+ path = os.path.join(app_dir, mo.group(2).strip())
library = ''
filenum = 0
for filename in glob.iglob(path):
@@ -77,7 +77,7 @@ def run_json_macros(doc, f_string, app_dir, ui):
def rjson(mo):
if mo.group(2).startswith('_attachments'):
# someone want to include from attachments
- path = os.path.join(app_dir, mo.group(2).strip(' '))
+ path = os.path.join(app_dir, mo.group(2).strip())
filenum = 0
for filename in glob.iglob(path):
library = ''

0 comments on commit 575c2d8

Please sign in to comment.