dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optional re.compile of generic_patterns

Browse Source
This commit is contained in:
mdipierro
2012-09-02 11:05:19 -05:00
parent 90ca080b1e
commit e27466b8a6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.6 (2012-09-01 22:35:37) stable Version 2.0.6 (2012-09-02 11:05:13) stable
gluon/compileapp.py
+7 -4
View File
@@ -581,10 +581,13 @@ def run_view_in(environment):
folder = request.folder folder = request.folder
path = pjoin(folder, 'compiled') path = pjoin(folder, 'compiled')
badv = 'invalid view (%s)' % view badv = 'invalid view (%s)' % view
patterns = response.generic_patterns or [] if response.generic_patterns:
regex = re.compile('|'.join(map(fnmatch.translate, patterns))) patterns = response.generic_patterns
short_action = '%(controller)s/%(function)s.%(extension)s' % request regex = re.compile('|'.join(map(fnmatch.translate, patterns)))
allow_generic = patterns and regex.search(short_action) short_action = '%(controller)s/%(function)s.%(extension)s' % request
allow_generic = regex.search(short_action)
else:
allow_generic = False
if not isinstance(view, str): if not isinstance(view, str):
ccode = parse_template(view, pjoin(folder, 'views'), ccode = parse_template(view, pjoin(folder, 'views'),
context=environment) context=environment)