diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 17:51:32 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 17:51:32 -0500 |
| commit | 666aa14bf15ed898472463d2ec890de0b8c60923 (patch) | |
| tree | f4ad79fb817cdca19e64dbb1abfe86c1a2c8ffc1 /passlib/apache.py | |
| parent | b6d904be92c77bce061c78034145958401bba381 (diff) | |
| download | passlib-666aa14bf15ed898472463d2ec890de0b8c60923.tar.gz | |
import cleanups
* moved bytes compat functions from utils to utils.compat
(bord, bjoin, bjoin_ints, bjoin_elems, ujoin)
* renamed bord -> belem_ord for clarify
* a bunch of to_native_str() always use ascii, and
have fixed input types (always bytes or always unicode).
these don't need overhead of to_native_str(), so replaced
those calls with two new funcs: compat.bascii_to_str() /
compat.uascii_to_str()
* cleaned up a lot of imports from utils/utils.compat to
pull from correct module
* simplified the to_string() logic of a bunch of handlers
to reduce unicode<->byte transitions
Diffstat (limited to 'passlib/apache.py')
| -rw-r--r-- | passlib/apache.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/passlib/apache.py b/passlib/apache.py index f34d1d0..ecde0ba 100644 --- a/passlib/apache.py +++ b/passlib/apache.py @@ -11,9 +11,8 @@ import sys #site #libs 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, unicode, u +from passlib.utils import consteq, render_bytes +from passlib.utils.compat import b, bytes, bjoin, lmap, u, unicode #pkg #local __all__ = [ |