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

gluon/html.py

@@ -1873,7 +1873,6 @@ class INPUT(DIV):
             t = self['_type'] = 'text'
         t = t.lower()
         value = self['value']
-
         if self['_value'] is None or isinstance(self['_value'], cgi.FieldStorage):
             _value = None
         else:
@@ -1903,7 +1902,6 @@ class INPUT(DIV):
             elif not isinstance(value, list):
                 self['_value'] = value
 
-
     def xml(self):
         name = self.attributes.get('_name', None)
         if name and hasattr(self, 'errors') \

gluon/http.py

@@ -60,6 +60,7 @@ defined_status = {
 
 regex_status = re.compile('^\d{3} [0-9A-Z ]+$')
 
+
 class HTTP(Exception):
     """Raises an HTTP response
 

gluon/tests/test_utils.py

@@ -9,6 +9,11 @@ from fix_path import fix_sys_path
 fix_sys_path(__file__)
 
 from utils import md5_hash
+from utils import compare
+
+import hashlib
+from hashlib import md5, sha1, sha224, sha256, sha384, sha512
+from utils import simple_hash, get_digest
 
 
 class TestUtils(unittest.TestCase):
@@ -20,6 +25,48 @@ class TestUtils(unittest.TestCase):
         data = md5_hash("web2py rocks")
         self.assertEqual(data, '79509f3246a2824dee64635303e99204')
         
+    def test_compare(self):
+        """ Tests the compare funciton """
+        
+        a, b = 'test123', 'test123'
+        compare_result_true = compare(a, b)
+        self.assertTrue(compare_result_true)
+        
+        a, b = 'test123', 'test456'
+        compare_result_false = compare(a, b)
+        self.assertFalse(compare_result_false)
+    
+    def test_simple_hash(self):
+        """ Tests the simple_hash function """
+        
+        # no key, no salt, md5
+        data_md5 = simple_hash('web2py rocks!', key='', salt='', digest_alg='md5')
+        self.assertEqual(data_md5, '37d95defba6c8834cb8cae86ee888568')
+        
+        # no key, no salt, sha1
+        data_sha1 = simple_hash('web2py rocks!', key='', salt='', digest_alg='sha1')
+        self.assertEqual(data_sha1, '00489a46753d8db260c71542611cdef80652c4b7')
+        
+        # no key, no salt, sha224
+        data_sha224 = simple_hash('web2py rocks!', key='', salt='', digest_alg='sha224')
+        self.assertEqual(data_sha224, '84d7054271842c2c17983baa2b1447e0289d101140a8c002d49d60da')
+        
+        # no key, no salt, sha256
+        data_sha256 = simple_hash('web2py rocks!', key='', salt='', digest_alg='sha256')
+        self.assertEqual(data_sha256, '0849f224d8deb267e4598702aaec1bd749e6caec90832469891012a4be24af08')
+        
+        # no key, no salt, sha384
+        data_sha384 = simple_hash('web2py rocks!', key='', salt='', digest_alg='sha384')
+        self.assertEqual(data_sha384, 
+            '3cffaf39371adbe84eb10f588d2718207d8e965e9172a27a278321b86977351376ae79f92e91d8c58cad86c491282d5f')
+        
+        # no key, no salt, sha512
+        data_sha512 = simple_hash('web2py rocks!', key='', salt='', digest_alg='sha512')
+        self.assertEqual(data_sha512, 'fa3237f594743e1d7b6c800bb134b3255cf4a98ab8b01e2ec23256328c9f8059'
+                                      '64fdef25a038d6cc3fda1b2fb45d66461eeed5c4669e506ec8bdfee71348db7e')
+
+
+
 class TestPack(unittest.TestCase):
     """ Tests the compileapp.py module """