Merge branch 'master' of github.com:web2py/web2py

gluon/tests/coverage.ini

@@ -5,6 +5,10 @@ source = gluon
 ## remove comment if you want applications coverage too
 #source = gluon, applications
 
+omit = gluon/contrib/*
+       gluon/tests/*
+       gluon/packages/*
+
 [report]
 # Regexes for lines to exclude from consideration
 exclude_lines =
@@ -23,10 +27,5 @@ exclude_lines =
     if 0:
     if __name__ == .__main__.:
 
-ignore_errors = True
-omit = gluon/contrib/*
-       gluon/tests/*
-       gluon/packages/*
-
 [html]
 directory = coverage_html_report

gluon/tests/test_validators.py

@@ -861,6 +861,10 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, [('', ''), ('id1', 'first label'), ('id2', 'second label')])
         rtn = IS_EMPTY_OR(IS_IN_SET([('id1', 'first label'), ('id2', 'second label')], zero='zero')).options()
         self.assertEqual(rtn, [('', 'zero'), ('id1', 'first label'), ('id2', 'second label')])
+        rtn = IS_EMPTY_OR((IS_LOWER(), IS_EMAIL()))('AAA')
+        self.assertEqual(rtn, ('aaa', 'Enter a valid email address'))
+        rtn = IS_EMPTY_OR([IS_LOWER(), IS_EMAIL()])('AAA')
+        self.assertEqual(rtn, ('aaa', 'Enter a valid email address'))
 
     def test_CLEANUP(self):
         rtn = CLEANUP()('helloò')

setup.py

@@ -63,7 +63,6 @@ def start():
                     'gluon/contrib/pymysql',
                     'gluon/contrib/pyrtf',
                     'gluon/contrib/pysimplesoap',
-                    'gluon/contrib/pg8000',
                     'gluon/contrib/plural_rules',
                     'gluon/contrib/minify',
                     'gluon/contrib/pyaes',