[Python-modules-commits] [python-passlib] 03/04: merge patched into master

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-passlib.

commit 44e45bf9229013f5bc00be15a16d2b2a5d62dc20
Merge: f15d6f0 bb7fe68
Author: Barry Warsaw <barry at debian.org>
Date:   Tue Jan 31 10:59:12 2017 -0500

    merge patched into master

 LICENSE                                          |   2 +-
 PKG-INFO                                         |   9 +-
 debian/.git-dpm                                  |   6 +-
 debian/patches/0001-Disable-Django-support.patch |  31 --
 debian/patches/series                            |   1 -
 docs/_fragments/asa_verify_callout.rst           |  15 +
 docs/conf.py                                     |   8 +-
 docs/history/1.5.rst                             |  10 +-
 docs/history/1.6.rst                             |  10 +-
 docs/history/1.7.rst                             |  64 +++-
 docs/history/ancient.rst                         |   6 +-
 docs/history/index.rst                           |  35 +-
 docs/index.rst                                   |  11 +-
 docs/install.rst                                 |  25 +-
 docs/lib/passlib.apache.rst                      |   2 +-
 docs/lib/passlib.apps.rst                        |   8 +-
 docs/lib/passlib.context.rst                     |  36 +-
 docs/lib/passlib.hash.argon2.rst                 |   2 +-
 docs/lib/passlib.hash.bcrypt.rst                 |   9 +-
 docs/lib/passlib.hash.bcrypt_sha256.rst          |   2 +-
 docs/lib/passlib.hash.bsdi_crypt.rst             |   4 +-
 docs/lib/passlib.hash.cisco_asa.rst              |  12 +-
 docs/lib/passlib.hash.cisco_pix.rst              | 133 ++++---
 docs/lib/passlib.hash.des_crypt.rst              |   2 +-
 docs/lib/passlib.hash.django_std.rst             |   4 +-
 docs/lib/passlib.hash.fshp.rst                   |   2 +-
 docs/lib/passlib.hash.hex_digests.rst            |   2 +-
 docs/lib/passlib.hash.ldap_crypt.rst             |   2 +-
 docs/lib/passlib.hash.ldap_std.rst               |   2 +-
 docs/lib/passlib.hash.lmhash.rst                 |   2 +-
 docs/lib/passlib.hash.md5_crypt.rst              |   4 +-
 docs/lib/passlib.hash.msdcc.rst                  |   2 +-
 docs/lib/passlib.hash.msdcc2.rst                 |   2 +-
 docs/lib/passlib.hash.mssql2000.rst              |   2 +-
 docs/lib/passlib.hash.mssql2005.rst              |   2 +-
 docs/lib/passlib.hash.mysql323.rst               |   2 +-
 docs/lib/passlib.hash.nthash.rst                 |   2 +-
 docs/lib/passlib.hash.oracle10.rst               |   2 +-
 docs/lib/passlib.hash.oracle11.rst               |   2 +-
 docs/lib/passlib.hash.pbkdf2_digest.rst          |   2 +-
 docs/lib/passlib.hash.postgres_md5.rst           |   2 +-
 docs/lib/passlib.hash.rst                        |  69 +++-
 docs/lib/passlib.hash.scram.rst                  |   2 +-
 docs/lib/passlib.hash.scrypt.rst                 |   4 +-
 docs/lib/passlib.hash.sha256_crypt.rst           |   2 +-
 docs/lib/passlib.hash.unix_disabled.rst          |   2 +-
 docs/lib/passlib.hosts.rst                       |   8 +-
 docs/lib/passlib.ifc.rst                         |   2 +-
 docs/narr/context-tutorial.rst                   |  10 +-
 docs/narr/hash-tutorial.rst                      |  95 +++--
 docs/narr/overview.rst                           |  10 +-
 docs/narr/quickstart.rst                         |  10 +-
 passlib/__init__.py                              |   2 +-
 passlib/_setup/docdist.py                        |  87 -----
 passlib/_setup/stamp.py                          | 112 +++++-
 passlib/apache.py                                |  12 +-
 passlib/context.py                               | 223 +++--------
 passlib/crypto/digest.py                         |   2 +-
 passlib/crypto/scrypt/__init__.py                |  90 +++--
 passlib/exc.py                                   |   8 +-
 passlib/ext/django/utils.py                      |   9 +-
 passlib/handlers/bcrypt.py                       |   4 +-
 passlib/handlers/cisco.py                        | 224 ++++++++---
 passlib/handlers/md5_crypt.py                    |   2 +-
 passlib/handlers/misc.py                         |   4 +-
 passlib/handlers/sha2_crypt.py                   |   2 +-
 passlib/ifc.py                                   |  30 +-
 passlib/pwd.py                                   |  64 ++--
 passlib/tests/test_context.py                    | 141 ++-----
 passlib/tests/test_crypto_scrypt.py              |   3 +-
 passlib/tests/test_ext_django.py                 |   5 +-
 passlib/tests/test_ext_django_source.py          |   5 +-
 passlib/tests/test_handlers.py                   | 241 +-----------
 passlib/tests/test_handlers_cisco.py             | 457 +++++++++++++++++++++++
 passlib/tests/test_handlers_pbkdf2.py            |  10 +-
 passlib/tests/test_handlers_scrypt.py            |   7 +-
 passlib/tests/test_pwd.py                        |   8 +
 passlib/tests/test_totp.py                       |  57 ++-
 passlib/tests/test_utils_handlers.py             |   6 +-
 passlib/tests/utils.py                           | 299 +++++++++++----
 passlib/totp.py                                  |   4 +-
 passlib/utils/__init__.py                        |   9 +-
 passlib/utils/handlers.py                        |  31 +-
 setup.cfg                                        |   1 -
 setup.py                                         | 204 +++++-----
 tox.ini                                          |  39 +-
 86 files changed, 1846 insertions(+), 1251 deletions(-)

diff --cc debian/.git-dpm
index 8429f23,0000000..e46eadf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9e5a4b32f8ff48670df80b7e97f88e3609ad6ca4
- 9e5a4b32f8ff48670df80b7e97f88e3609ad6ca4
- 4f8eb9d90fdaa143465e40bef41fd151466854dc
++bb7fe6848e106c697364f39d5c6eabdf44eb7bb4
++bb7fe6848e106c697364f39d5c6eabdf44eb7bb4
++bb7fe6848e106c697364f39d5c6eabdf44eb7bb4
 +bb7fe6848e106c697364f39d5c6eabdf44eb7bb4
 +python-passlib_1.7.1.orig.tar.gz
 +1fccaee7a5a158ee04274e18f4927a6a603c6901
 +645724
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-passlib.git