Merge pull request #2145 from leonelcamara/expose

don't use a regex to find exposed functions

gluon/compileapp.py

@@ -23,7 +23,6 @@ from gluon.storage import Storage, List
 from gluon.template import parse_template
 from gluon.restricted import restricted, compile2
 from gluon.fileutils import mktree, listdir, read_file, write_file
-from gluon.myregex import regex_expose, regex_longcomments
 from gluon.languages import TranslatorFactory
 from gluon.dal import DAL, Field
 from gluon.validators import Validator
@@ -45,6 +44,7 @@ from functools import reduce
 from gluon import rewrite
 from gluon.custom_import import custom_import_install
 import py_compile
+import ast
 
 logger = logging.getLogger("web2py")
 
@@ -517,8 +517,8 @@ def compile_models(folder):
 
 
 def find_exposed_functions(data):
-    data = regex_longcomments.sub('', data)
+    parsed = ast.parse(data)
-    return regex_expose.findall(data)
+    return [n.name for n in ast.walk(parsed) if type(n) == ast.FunctionDef and len(n.args.args) == 0 and n.args.kwarg is None]
 
 
 def compile_controllers(folder):

gluon/myregex.py

@@ -18,13 +18,7 @@ regex_tables = re.compile(
     """^[\w]+\.define_table\(\s*[\'\"](?P<name>\w+)[\'\"]""",
     flags=re.M)
 
-# pattern to find exposed functions in controller
+# patterns to find includes and extends in views
-
-regex_expose = re.compile(
-    '^def\s+(?P<name>_?[a-zA-Z0-9]\w*)\( *\)\s*:',
-    flags=re.M)
-
-regex_longcomments = re.compile('(""".*?"""|'+"'''.*?''')", re.DOTALL)
 
 regex_include = re.compile(
     '(?P<all>\{\{\s*include\s+[\'"](?P<name>[^\'"]*)[\'"]\s*\}\})')