diff --git a/VERSION b/VERSION index 2588c406..9bced999 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.0 (2012-12-05 16:48:37) rc1 +Version 2.3.0 (2012-12-06 16:55:43) rc1 diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index ad0d0d9e..7bce9bc3 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -29,7 +29,7 @@ device-width: Occupy full width of the screen in its current orientation initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height user-scalable = yes allows the user to zoom in --> - + diff --git a/gluon/myregex.py b/gluon/myregex.py index f53943ca..15e7ff6b 100644 --- a/gluon/myregex.py +++ b/gluon/myregex.py @@ -18,7 +18,7 @@ regex_tables = re.compile( # pattern to find exposed functions in controller regex_expose = re.compile( - '^def\s+(?P(?:[a-zA-Z0-9]\w*)|(?:_[a-zA-Z0-9]\w*))\(\)\s*:', + '^def\s+(?P_?[a-zA-Z0-9]\w*)\( *\)\s*:', flags=re.M) regex_include = re.compile(