Merge from stable

As part of merge:
* various: reverted the py26 compat fixes from rev 5e2f92012412
* test utils: stripped out "has_real_subtest" compat from rev c732a9e2a582,
  since now on py35+, which always has .subTest() method

1 files changed, 10 insertions, 4 deletions

diff --git a/passlib/exc.py b/passlib/exc.py
index 262eb12..29ef8af 100644
--- a/passlib/exc.py
+++ b/passlib/exc.py
@@ -193,17 +193,23 @@ class UnknownHashError(ValueError):
     As of version 1.7.3, this may also be raised if hash algorithm is known,
     but has been disabled due to FIPS mode (message will include phrase "disabled for fips").
 
+    As of version 1.7.4, this may be raised if a :class:`~passlib.context.CryptContext`
+    is unable to identify the algorithm used by a password hash.
+
     .. versionadded:: 1.7
 
     .. versionchanged: 1.7.3
         added 'message' argument.
+
+    .. versionchanged:: 1.7.4
+        altered call signature.
     """
-    def __init__(self, name, message=None):
-        self.name = name
+    def __init__(self, message=None, value=None):
+        self.value = value
         if message is None:
-            message = "unknown hash algorithm: %r" % name
+            message = "unknown hash algorithm: %r" % value
         self.message = message
-        ValueError.__init__(self, name, message)
+        ValueError.__init__(self, message, value)
 
     def __str__(self):
         return self.message