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/utils/handlers.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/utils/handlers.py')
| -rw-r--r-- | passlib/utils/handlers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/passlib/utils/handlers.py b/passlib/utils/handlers.py index 911bba2..2d283c5 100644 --- a/passlib/utils/handlers.py +++ b/passlib/utils/handlers.py @@ -19,8 +19,8 @@ from passlib.registry import get_crypt_handler from passlib.utils import classproperty, consteq, getrandstr, getrandbytes,\ BASE64_CHARS, HASH64_CHARS, rng, to_native_str, \ is_crypt_handler, deprecated_function, to_unicode -from passlib.utils.compat import b, bjoin_ints, bytes, irange, u, \ - uascii_to_str, ujoin, unicode, str_to_uascii +from passlib.utils.compat import b, join_byte_values, bytes, irange, u, \ + uascii_to_str, join_unicode, unicode, str_to_uascii # local __all__ = [ # helpers for implementing MCF handlers @@ -57,7 +57,7 @@ LOWER_HEX_CHARS = u("0123456789abcdef") #: special byte string containing all possible byte values # XXX: treated as singleton by some of the code for efficiency. -ALL_BYTE_VALUES = bjoin_ints(irange(256)) +ALL_BYTE_VALUES = join_byte_values(irange(256)) # deprecated aliases - will be removed after passlib 1.8 H64_CHARS = HASH64_CHARS |