diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-03-12 21:33:28 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-03-12 21:33:28 -0400 |
| commit | 3913a59ad033462e6a389544ffcdf8055db7ad9c (patch) | |
| tree | 63dda089e61a9d8ef4b468a323df8c2ec2ad6c70 /passlib/apache.py | |
| parent | b970d6ee145122005f1e6808466900a94e00dfcc (diff) | |
| download | passlib-3913a59ad033462e6a389544ffcdf8055db7ad9c.tar.gz | |
updated test support & py3 compat code from an external library
passlib.tests
-------------
* deprecated support for unittest 1... accumulated too many backports,
planning to require unittest2 in next release.
* case_prefix renamed to shortDescription
* test case now archives & clears warning registry state in addition
to warning filter state
passlib.utils.compat
--------------------
* a bunch of the bytes-related functions were renamed for clarity
* NativeStringIO alias added
* trange alias merged into irange
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 63fa39b..05f4b68 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, str_to_bascii, u, unicode +from passlib.utils.compat import b, bytes, join_bytes, lmap, str_to_bascii, u, unicode #pkg #local __all__ = [ @@ -148,7 +148,7 @@ class _CommonFile(object): def to_string(self): "export whole database as a byte string" - return bjoin(self._iter_lines()) + return join_bytes(self._iter_lines()) #subclass: _render_line(entry) -> line |