diff --git a/VERSION b/VERSION index 6825be0a..3ab446d1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.01.08.11.35.00 +Version 2.4.1-alpha.2+timestamp.2013.01.08.14.36.21 diff --git a/gluon/html.py b/gluon/html.py index 5b532b17..265f5500 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -991,7 +991,7 @@ class DIV(XmlComponent): >>> a=FORM( INPUT(_type='text'), SELECT(range(1)), TEXTAREA() ) >>> for c in a.elements('input, select, textarea'): c['_disabled'] = 'disabled' >>> a.xml() - '
' + '
' Elements that are matched can also be replaced or removed by specifying a "replace" argument (note, a list of the original matching elements @@ -1932,7 +1932,7 @@ class FORM(DIV): >>> from validators import IS_NOT_EMPTY >>> form=FORM(INPUT(_name=\"test\", requires=IS_NOT_EMPTY())) >>> form.xml() - '
' + '
' a FORM is container for INPUT, TEXTAREA, SELECT and other helpers @@ -2033,7 +2033,7 @@ class FORM(DIV): def _postprocessing(self): if not '_action' in self.attributes: - self['_action'] = '' + self['_action'] = '#' if not '_method' in self.attributes: self['_method'] = 'post' if not '_enctype' in self.attributes: @@ -2415,25 +2415,25 @@ def test():
abc
def
123
>>> form=FORM(INPUT(_type='text', _name='myvar', requires=IS_EXPR('int(value)<10'))) >>> print form.xml() -
+
>>> print form.accepts({'myvar':'34'}, formname=None) False >>> print form.xml() -
invalid expression
+
invalid expression
>>> print form.accepts({'myvar':'4'}, formname=None, keepvalues=True) True >>> print form.xml() -
+
>>> form=FORM(SELECT('cat', 'dog', _name='myvar')) >>> print form.accepts({'myvar':'dog'}, formname=None, keepvalues=True) True >>> print form.xml() -
+
>>> form=FORM(INPUT(_type='text', _name='myvar', requires=IS_MATCH('^\w+$', 'only alphanumeric!'))) >>> print form.accepts({'myvar':'as df'}, formname=None) False >>> print form.xml() -
only alphanumeric!
+
only alphanumeric!
>>> session={} >>> form=FORM(INPUT(value=\"Hello World\", _name=\"var\", requires=IS_MATCH('^\w+$'))) >>> if form.accepts({}, session,formname=None): print 'passed' diff --git a/gluon/reserved_sql_keywords.py b/gluon/reserved_sql_keywords.py index 320711e6..9ff314ae 100644 --- a/gluon/reserved_sql_keywords.py +++ b/gluon/reserved_sql_keywords.py @@ -1687,7 +1687,7 @@ SQLITE = set(( )) -MONGODB_NONRESERVED = set(('ID_', 'SAFE',)) +MONGODB_NONRESERVED = set(('SAFE',)) # remove from here when you add a list. JDBCSQLITE = SQLITE diff --git a/gluon/tests/test_html.py b/gluon/tests/test_html.py index 336eff9b..1273f2bd 100644 --- a/gluon/tests/test_html.py +++ b/gluon/tests/test_html.py @@ -74,7 +74,7 @@ class TestBareHelpers(unittest.TestCase): def testFORM(self): self.assertEqual(FORM('<>', _a='1', _b='2').xml(), - '
<>
') + '
<>
') def testH1(self): self.assertEqual(H1('<>', _a='1', _b='2').xml(),