Improve PEP8

gluon/tests/test_validators.py

@@ -438,12 +438,10 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, (datetime.date(2008, 3, 3), None))
         rtn = v(datetime.date(2010, 3, 3))
         self.assertEqual(rtn, (datetime.date(2010, 3, 3), 'oops'))
-        v = IS_DATE_IN_RANGE(maximum=datetime.date(2009,12,31),
+        v = IS_DATE_IN_RANGE(maximum=datetime.date(2009, 12, 31), format="%m/%d/%Y")
-            format="%m/%d/%Y")
         rtn = v('03/03/2010')
         self.assertEqual(rtn, ('03/03/2010', 'Enter date on or before 12/31/2009'))
-        v = IS_DATE_IN_RANGE(minimum=datetime.date(2008,1,1),
+        v = IS_DATE_IN_RANGE(minimum=datetime.date(2008, 1, 1), format="%m/%d/%Y")
-            format="%m/%d/%Y")
         rtn = v('03/03/2007')
         self.assertEqual(rtn, ('03/03/2007', 'Enter date on or after 01/01/2008'))
         v = IS_DATE_IN_RANGE(minimum=datetime.date(2008, 1, 1),
@@ -453,8 +451,7 @@ class TestValidators(unittest.TestCase):
         self.assertEqual(rtn, ('03/03/2007', 'Enter date in range 01/01/2008 12/31/2009'))
 
     def test_IS_DATETIME_IN_RANGE(self):
-        v = IS_DATETIME_IN_RANGE(
+        v = IS_DATETIME_IN_RANGE(minimum=datetime.datetime(2008, 1, 1, 12, 20),
-            minimum=datetime.datetime(2008,1,1,12,20),
                                  maximum=datetime.datetime(2009, 12, 31, 12, 20),
                                  format="%m/%d/%Y %H:%M", error_message="oops")
         rtn = v('03/03/2008 12:40')
@@ -477,7 +474,8 @@ class TestValidators(unittest.TestCase):
                                  maximum=datetime.datetime(2009, 12, 31, 12, 20),
                                  format='%m/%d/%Y %H:%M:%S')
         rtn = v('03/03/2007 12:20:00')
-        self.assertEqual(rtn, ('03/03/2007 12:20:00', 'Enter date and time in range 01/01/2008 12:20:00 12/31/2009 12:20:00'))
+        self.assertEqual(rtn, ('03/03/2007 12:20:00',
+                               'Enter date and time in range 01/01/2008 12:20:00 12/31/2009 12:20:00'))
 
     def test_IS_LIST_OF(self):
         values = [0, 1, 2, 3, 4]
@@ -600,8 +598,7 @@ class TestValidators(unittest.TestCase):
 
     def test_IS_STRONG(self):
         rtn = IS_STRONG(es=True)('Abcd1234')
-        self.assertEqual(rtn, ('Abcd1234',
+        self.assertEqual(rtn, ('Abcd1234', 'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|'))
-         'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|'))
         rtn = IS_STRONG(es=True)('Abcd1234!')
         self.assertEqual(rtn, ('Abcd1234!', None))
         rtn = IS_STRONG(es=True, entropy=1)('a')
@@ -627,16 +624,14 @@ class TestValidators(unittest.TestCase):
                                     'Maximum length is 4',
                                     'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|',
                                     'Must include at least 1 upper case',
-                      'Must include at least 1 number']))
+                                    'Must include at least 1 number'])))
-            )
         rtn = IS_STRONG(es=True)('abcde')
         self.assertEqual(rtn,
                          ('abcde',
                           '|'.join(['Minimum length is 8',
                                     'Must include at least 1 of the following: ~!@#$%^&*()_+-=?<>,.:;{}[]|',
                                     'Must include at least 1 upper case',
-                      'Must include at least 1 number']))
+                                    'Must include at least 1 number'])))
-            )
 
     # TODO: def test_IS_IN_SUBSET(self):
 
@@ -645,6 +640,7 @@ class TestValidators(unittest.TestCase):
     def test_IS_UPLOAD_FILENAME(self):
         import cgi
         from StringIO import StringIO
+
         def gen_fake(filename):
             formdata_file_data = """
 ---123