diff --git a/gluon/myregex.py b/gluon/myregex.py deleted file mode 100644 index 5c3a7c99..00000000 --- a/gluon/myregex.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -""" -| This file is part of the web2py Web Framework -| Copyrighted by Massimo Di Pierro -| License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html) - -Useful regexes ---------------- -""" - -import re - -# pattern to find defined tables - -regex_tables = re.compile( - """^[\w]+\.define_table\(\s*[\'\"](?P\w+)[\'\"]""", - flags=re.M) - -# pattern to find exposed functions in controller - -regex_expose = re.compile( - '^def\s+(?P_?[a-zA-Z0-9]\w*)\( *\)\s*:', - flags=re.M) - -regex_longcomments = re.compile('(""".*?"""|'+"'''.*?''')", re.DOTALL) - -regex_include = re.compile( - '(?P\{\{\s*include\s+[\'"](?P[^\'"]*)[\'"]\s*\}\})') - -regex_extend = re.compile( - '^\s*(?P\{\{\s*extend\s+[\'"](?P[^\'"]+)[\'"]\s*\}\})', re.MULTILINE) diff --git a/gluon/packages/dal b/gluon/packages/dal index cd1b2ed6..3815fbe9 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit cd1b2ed6d9b03cd837660f64b2528aff6413f8f8 +Subproject commit 3815fbe9b6f7af4e2fa28c509010fea10d072b02