Merge pull request #74 from clee704/master

Fix PasswordType

sqlalchemy_utils/types/password.py

@@ -143,7 +143,7 @@ class PasswordType(types.TypeDecorator, ScalarCoercible):
             scheme = getattr(__import__('passlib.hash').hash, name)
             length = 4 + len(scheme.name)
             length += len(str(getattr(scheme, 'max_rounds', '')))
-            length += scheme.max_salt_size or 0
+            length += getattr(scheme, 'max_salt_size', 0)
             length += getattr(
                 scheme,
                 'encoded_checksum_size',

tests/types/test_password.py

@@ -16,10 +16,11 @@ class TestPasswordType(TestCase):
                 schemes=[
                     'pbkdf2_sha512',
                     'pbkdf2_sha256',
-                    'md5_crypt'
+                    'md5_crypt',
+                    'hex_md5'
                 ],
 
-                deprecated=['md5_crypt']
+                deprecated=['md5_crypt', 'hex_md5']
             ))
 
             def __repr__(self):