diff --git a/VERSION b/VERSION index 380df13a..383e4474 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.3 (2011-12-06 21:15:07) dev +Version 1.99.3 (2011-12-08 08:35:52) dev diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 24c97096..8aa9a8b9 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -242,7 +242,7 @@ regex_code = re.compile('('+META+')|(``(?P.*?)``(:(?P\w+))?)',re.S) regex_maps = [ (re.compile('[ \t\r]+\n'),'\n'), (re.compile('[ \t\r]+\n'),'\n'), - (re.compile('\*\*(?P[^\s\*]+( +[^\s\*]+)*)\*\*'),'\g'), + (re.compile('\*\*(?P[^\s\*]+( +[^\s\*]+)*)\*\*'),'\g'), (re.compile("''(?P[^\s']+( +[^\s']+)*)''"),'\g'), (re.compile('^#{6} (?P[^\n]+)',re.M),'\n\n<
\g
\n'), (re.compile('^#{5} (?P[^\n]+)',re.M),'\n\n<
\g
\n'), diff --git a/gluon/dal.py b/gluon/dal.py index a063bb94..0fb776d9 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5492,8 +5492,8 @@ class SQLCustomType(object): self.validator = validator self._class = _class or type - def startswith(self, dummy=None): - return False + def startswith(self, text=None): + return self.type.startswith(self,text) def __getslice__(self, a=0, b=100): return None