summaryrefslogtreecommitdiff
path: root/passlib/apache.py
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2011-12-06 12:40:53 -0500
committerEli Collins <elic@assurancetechnologies.com>2011-12-06 12:40:53 -0500
commitd07f2084c1532c121935cebf92cdbdd41c43bb57 (patch)
tree6b4de725a11627b7dab460ac1e000b4a107daae7 /passlib/apache.py
parent295e3874293a3697b593f7e15fcbed9f5d580fb4 (diff)
downloadpasslib-d07f2084c1532c121935cebf92cdbdd41c43bb57.tar.gz
added compatibility module (passlib.utils.compat)
exports specialized range & map aliases, and some dict helpers * all dict.iteritems() calls replaced with compat.iteritems(dict) * all xrange() calls replaced with compat.irange() * all range() calls replaced with compat.trange() and compat.lrange() as appropriate * all map() calls replaced with compat.lmap()
Diffstat (limited to 'passlib/apache.py')
-rw-r--r--passlib/apache.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/passlib/apache.py b/passlib/apache.py
index 0bf3301..b43e04d 100644
--- a/passlib/apache.py
+++ b/passlib/apache.py
@@ -13,6 +13,7 @@ import sys
from passlib.context import CryptContext
from passlib.utils import render_bytes, bjoin, bytes, b, \
to_unicode, to_bytes, consteq
+from passlib.utils.compat import lmap
#pkg
#local
__all__ = [
@@ -319,7 +320,7 @@ class HtpasswdFile(_CommonFile):
def users(self):
"return list of all users in file"
- return map(self._decode_ident, self._entry_order)
+ return lmap(self._decode_ident, self._entry_order)
def update(self, user, password):
"""update password for user; adds user if needed.
@@ -454,13 +455,13 @@ class HtdigestFile(_CommonFile):
def realms(self):
"return all realms listed in file"
- return map(self._decode_ident,
+ return lmap(self._decode_ident,
set(key[1] for key in self._entry_order))
def users(self, realm):
"return list of all users within specified realm"
realm = self._norm_realm(realm)
- return map(self._decode_ident,
+ return lmap(self._decode_ident,
(key[0] for key in self._entry_order if key[1] == realm))
def update(self, user, realm, password):