From e27466b8a68a97ecce3b749f2de4f24c9c7aeeff Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 2 Sep 2012 11:05:19 -0500 Subject: [PATCH] optional re.compile of generic_patterns --- VERSION | 2 +- gluon/compileapp.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 1d1a19a4..e1c3cfc0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.6 (2012-09-01 22:35:37) stable +Version 2.0.6 (2012-09-02 11:05:13) stable diff --git a/gluon/compileapp.py b/gluon/compileapp.py index e9e8d8a8..f9c6c801 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -581,10 +581,13 @@ def run_view_in(environment): folder = request.folder path = pjoin(folder, 'compiled') badv = 'invalid view (%s)' % view - patterns = response.generic_patterns or [] - regex = re.compile('|'.join(map(fnmatch.translate, patterns))) - short_action = '%(controller)s/%(function)s.%(extension)s' % request - allow_generic = patterns and regex.search(short_action) + if response.generic_patterns: + patterns = response.generic_patterns + regex = re.compile('|'.join(map(fnmatch.translate, patterns))) + short_action = '%(controller)s/%(function)s.%(extension)s' % request + allow_generic = regex.search(short_action) + else: + allow_generic = False if not isinstance(view, str): ccode = parse_template(view, pjoin(folder, 'views'), context=environment)