summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2012-03-12 21:33:28 -0400
committerEli Collins <elic@assurancetechnologies.com>2012-03-12 21:33:28 -0400
commit3913a59ad033462e6a389544ffcdf8055db7ad9c (patch)
tree63dda089e61a9d8ef4b468a323df8c2ec2ad6c70 /docs
parentb970d6ee145122005f1e6808466900a94e00dfcc (diff)
downloadpasslib-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 'docs')
-rw-r--r--docs/lib/passlib.utils.compat.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/lib/passlib.utils.compat.rst b/docs/lib/passlib.utils.compat.rst
index 5add85d..2536b0a 100644
--- a/docs/lib/passlib.utils.compat.rst
+++ b/docs/lib/passlib.utils.compat.rst
@@ -17,27 +17,27 @@ Unicode Helpers
.. autofunction:: uascii_to_str
.. autofunction:: str_to_uascii
-.. function:: ujoin
+.. function:: join_unicode
Join a sequence of unicode strings, e.g.
- ``ujoin([u"a",u"b",u"c"]) -> u"abc"``.
+ ``join_unicode([u"a",u"b",u"c"]) -> u"abc"``.
Bytes Helpers
=============
.. autofunction:: bascii_to_str
.. autofunction:: str_to_bascii
-.. function:: bjoin
+.. function:: join_bytes
Join a sequence of byte strings, e.g.
- ``bjoin([b"a",b"b",b"c"]) -> b"abc"``.
+ ``join_bytes([b"a",b"b",b"c"]) -> b"abc"``.
-.. function:: bjoin_ints
+.. function:: join_byte_values
Join a sequence of integers into a byte string,
- e.g. ``bjoin_ints([97,98,99]) -> b"abc"``.
+ e.g. ``join_byte_values([97,98,99]) -> b"abc"``.
-.. function:: bjoin_elems
+.. function:: join_byte_elems
Join a sequence of byte elements into a byte string.
@@ -49,8 +49,8 @@ Bytes Helpers
This function will join a sequence of the appropriate type
for the given python version -- under Python 2, this is an alias
- for :func:`bjoin`, under Python 3 this is an alias for :func:`bjoin_ints`.
+ for :func:`join_bytes`, under Python 3 this is an alias for :func:`join_byte_values`.
-.. function:: belem_ord
+.. function:: byte_elem_value
Function to convert byte element to integer (a no-op under PY3)