diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 20:01:20 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 20:01:20 -0500 |
| commit | bebb8be9cca116e1331cdb9154b225a69fa9b8b7 (patch) | |
| tree | c34ef49378a1c9f8059ceadf9f39493dff181ef9 /passlib/apache.py | |
| parent | c1927edb87df4f22c5d5471e88f42b085a1a946a (diff) | |
| download | passlib-bebb8be9cca116e1331cdb9154b225a69fa9b8b7.tar.gz | |
misc bugfixes from round of changes
* added str_to_[ub]ascii to wrap hexdigest() calls
* fixed some h64big calls I missed
* some py3 fixes
* removed utils.compat.aliases, using overlay
to replace real compat module instead
(to agree w/ imports already in code)
Diffstat (limited to 'passlib/apache.py')
| -rw-r--r-- | passlib/apache.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/passlib/apache.py b/passlib/apache.py index ecde0ba..63fa39b 100644 --- a/passlib/apache.py +++ b/passlib/apache.py @@ -12,7 +12,7 @@ import sys #libs from passlib.context import CryptContext from passlib.utils import consteq, render_bytes -from passlib.utils.compat import b, bytes, bjoin, lmap, u, unicode +from passlib.utils.compat import b, bytes, bjoin, lmap, str_to_bascii, u, unicode #pkg #local __all__ = [ @@ -450,7 +450,7 @@ class HtdigestFile(_CommonFile): if isinstance(password, unicode): password = password.encode(self.password_encoding) #NOTE: encode('ascii') is noop under py2, required under py3 - return md5(render_bytes("%s:%s:%s", user, realm, password)).hexdigest().encode("ascii") + return str_to_bascii(md5(render_bytes("%s:%s:%s", user, realm, password)).hexdigest()) def realms(self): "return all realms listed in file" |