[Python-modules-commits] [python-passlib] 04/05: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Nov 28 16:30:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository python-passlib.
commit c22d051d0844933e8eb7bc6dced07e69a263424c
Merge: 9306f6a 9e5a4b3
Author: Barry Warsaw <barry at python.org>
Date: Mon Nov 28 11:08:22 2016 -0500
merge patched into master
LICENSE | 19 +-
MANIFEST.in | 1 +
PKG-INFO | 17 +-
README | 15 +-
debian/.git-dpm | 6 +-
debian/patches/0001-Disable-Django-support.patch | 10 +-
docs/_fragments/insecure_hash_warning.rst | 9 +
docs/_fragments/trivial_hash_warning.rst | 8 +
docs/_static/bb-logo.png | Bin 0 -> 17166 bytes
docs/_static/bb-logo.svg | 929 +++
docs/_static/masthead.png | Bin 7827 -> 9173 bytes
docs/_static/masthead.svg | 42 +-
docs/conf.py | 71 +-
docs/contents.rst | 28 +-
docs/{requirements.txt => dev-requirements.txt} | 0
docs/faq.rst | 75 +
docs/history.rst | 9 +-
docs/history/1.5.rst | 173 +
CHANGES => docs/history/1.6.rst | 357 +-
docs/history/1.7.rst | 311 +
docs/history/ancient.rst | 126 +
docs/history/index.rst | 22 +
docs/index.rst | 123 +-
docs/install.rst | 73 +-
docs/lib/index.rst | 55 +
docs/lib/passlib.apache.rst | 7 +-
docs/lib/passlib.apps.rst | 12 +-
docs/lib/passlib.context-tutorial.rst | 555 +-
docs/lib/passlib.context.rst | 141 +-
...asslib.utils.des.rst => passlib.crypto.des.rst} | 13 +-
docs/lib/passlib.crypto.digest.rst | 48 +
docs/lib/passlib.crypto.rst | 18 +
docs/lib/passlib.exc.rst | 17 +-
docs/lib/passlib.ext.django.rst | 27 +-
docs/lib/passlib.hash.apr_md5_crypt.rst | 5 +-
docs/lib/passlib.hash.argon2.rst | 130 +
docs/lib/passlib.hash.bcrypt.rst | 17 +-
docs/lib/passlib.hash.bcrypt_sha256.rst | 4 +-
docs/lib/passlib.hash.bigcrypt.rst | 12 +-
docs/lib/passlib.hash.bsdi_crypt.rst | 18 +-
docs/lib/passlib.hash.cisco_asa.rst | 18 +
docs/lib/passlib.hash.cisco_pix.rst | 53 +-
docs/lib/passlib.hash.cisco_type7.rst | 8 +-
docs/lib/passlib.hash.crypt16.rst | 12 +-
docs/lib/passlib.hash.des_crypt.rst | 15 +-
docs/lib/passlib.hash.django_std.rst | 77 +-
docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst | 4 +-
docs/lib/passlib.hash.fshp.rst | 6 +-
docs/lib/passlib.hash.grub_pbkdf2_sha512.rst | 4 +-
docs/lib/passlib.hash.hex_digests.rst | 4 +-
docs/lib/passlib.hash.ldap_crypt.rst | 2 +-
docs/lib/passlib.hash.ldap_std.rst | 2 +-
docs/lib/passlib.hash.lmhash.rst | 20 +-
docs/lib/passlib.hash.md5_crypt.rst | 18 +-
docs/lib/passlib.hash.msdcc.rst | 9 +-
docs/lib/passlib.hash.msdcc2.rst | 4 +-
docs/lib/passlib.hash.mssql2000.rst | 9 +-
docs/lib/passlib.hash.mssql2005.rst | 9 +-
docs/lib/passlib.hash.mysql323.rst | 10 +-
docs/lib/passlib.hash.mysql41.rst | 8 +-
docs/lib/passlib.hash.nthash.rst | 15 +-
docs/lib/passlib.hash.oracle10.rst | 9 +-
docs/lib/passlib.hash.oracle11.rst | 2 +-
docs/lib/passlib.hash.pbkdf2_digest.rst | 14 +-
docs/lib/passlib.hash.plaintext.rst | 2 +-
docs/lib/passlib.hash.postgres_md5.rst | 7 +-
docs/lib/passlib.hash.rst | 226 +-
docs/lib/passlib.hash.scram.rst | 12 +-
docs/lib/passlib.hash.scrypt.rst | 123 +
docs/lib/passlib.hash.sha1_crypt.rst | 2 +-
docs/lib/passlib.hash.sha256_crypt.rst | 27 +-
docs/lib/passlib.hash.unix_disabled.rst | 2 +-
docs/lib/passlib.hosts.rst | 6 +-
.../{password_hash_api.rst => lib/passlib.ifc.rst} | 445 +-
docs/lib/passlib.pwd.rst | 62 +
docs/lib/passlib.totp.rst | 189 +
docs/lib/passlib.utils.binary.rst | 89 +
docs/lib/passlib.utils.des.rst | 13 +-
docs/lib/passlib.utils.handlers.rst | 4 -
docs/lib/passlib.utils.md4.rst | 26 -
docs/lib/passlib.utils.pbkdf2.rst | 18 +-
docs/lib/passlib.utils.rst | 106 +-
docs/modular_crypt_format.rst | 49 +-
.../context-tutorial.rst} | 105 +-
docs/narr/hash-tutorial.rst | 310 +
docs/narr/index.rst | 30 +
docs/narr/overview.rst | 92 +
docs/narr/quickstart.rst | 297 +
docs/narr/totp-tutorial.rst | 772 ++
docs/new_app_quickstart.rst | 242 +-
docs/other.rst | 14 +
docs/overview.rst | 81 +-
docs/password_hash_api.rst | 744 +-
docs/requirements.txt | 4 +
passlib.egg-info/requires.txt | 9 +
passlib/__init__.py | 2 +-
passlib/_data/wordsets/bip39.txt | 2049 ++++++
passlib/_data/wordsets/eff_long.txt | 7776 ++++++++++++++++++++
passlib/_data/wordsets/eff_prefixed.txt | 1296 ++++
passlib/_data/wordsets/eff_short.txt | 1296 ++++
passlib/_setup/stamp.py | 1 -
passlib/apache.py | 437 +-
passlib/apps.py | 9 +-
passlib/context.py | 1180 +--
passlib/crypto/__init__.py | 1 +
passlib/{utils => crypto}/_blowfish/__init__.py | 13 +-
passlib/{utils => crypto}/_blowfish/_gen_files.py | 6 +-
passlib/{utils => crypto}/_blowfish/base.py | 3 +-
passlib/{utils => crypto}/_blowfish/unrolled.py | 4 +-
passlib/{utils/md4.py => crypto/_md4.py} | 64 +-
passlib/{utils => crypto}/des.py | 23 +-
passlib/crypto/digest.py | 891 +++
passlib/crypto/scrypt/__init__.py | 196 +
passlib/crypto/scrypt/_builtin.py | 244 +
passlib/crypto/scrypt/_gen_files.py | 154 +
passlib/crypto/scrypt/_salsa.py | 170 +
passlib/exc.py | 120 +-
passlib/ext/django/models.py | 310 +-
passlib/ext/django/utils.py | 1016 ++-
passlib/handlers/argon2.py | 825 +++
passlib/handlers/bcrypt.py | 954 ++-
passlib/handlers/cisco.py | 193 +-
passlib/handlers/des_crypt.py | 244 +-
passlib/handlers/digests.py | 46 +-
passlib/handlers/django.py | 144 +-
passlib/handlers/fshp.py | 46 +-
passlib/handlers/ldap_digests.py | 30 +-
passlib/handlers/md5_crypt.py | 49 +-
passlib/handlers/misc.py | 121 +-
passlib/handlers/mssql.py | 14 +-
passlib/handlers/mysql.py | 8 +-
passlib/handlers/oracle.py | 19 +-
passlib/handlers/pbkdf2.py | 103 +-
passlib/handlers/phpass.py | 10 +-
passlib/handlers/postgres.py | 6 +-
passlib/handlers/scram.py | 126 +-
passlib/handlers/scrypt.py | 383 +
passlib/handlers/sha1_crypt.py | 68 +-
passlib/handlers/sha2_crypt.py | 95 +-
passlib/handlers/sun_md5_crypt.py | 89 +-
passlib/handlers/windows.py | 70 +-
passlib/hash.py | 54 +-
passlib/hosts.py | 23 +-
passlib/ifc.py | 236 +-
passlib/pwd.py | 794 ++
passlib/registry.py | 135 +-
passlib/tests/backports.py | 298 +-
passlib/tests/sample1.cfg | 4 +-
passlib/tests/sample1b.cfg | 4 +-
passlib/tests/sample1c.cfg | Bin 490 -> 490 bytes
passlib/tests/test_apache.py | 187 +-
passlib/tests/test_apps.py | 17 +-
passlib/tests/test_context.py | 781 +-
passlib/tests/test_context_deprecated.py | 31 +-
passlib/tests/test_crypto_builtin_md4.py | 160 +
passlib/tests/test_crypto_des.py | 194 +
passlib/tests/test_crypto_digest.py | 499 ++
passlib/tests/test_crypto_scrypt.py | 600 ++
passlib/tests/test_ext_django.py | 577 +-
passlib/tests/test_ext_django_source.py | 251 +
passlib/tests/test_handlers.py | 684 +-
passlib/tests/test_handlers_argon2.py | 366 +
passlib/tests/test_handlers_bcrypt.py | 216 +-
passlib/tests/test_handlers_django.py | 207 +-
passlib/tests/test_handlers_pbkdf2.py | 480 ++
passlib/tests/test_handlers_scrypt.py | 109 +
passlib/tests/test_hosts.py | 1 -
passlib/tests/test_pwd.py | 197 +
passlib/tests/test_registry.py | 15 +-
passlib/tests/test_totp.py | 1563 ++++
passlib/tests/test_utils.py | 346 +-
passlib/tests/test_utils_crypto.py | 599 --
passlib/tests/test_utils_handlers.py | 209 +-
passlib/tests/test_utils_md4.py | 41 +
passlib/tests/test_utils_pbkdf2.py | 322 +
passlib/tests/test_win32.py | 1 -
passlib/tests/utils.py | 1902 +++--
passlib/totp.py | 1900 +++++
passlib/utils/__init__.py | 1101 +--
passlib/utils/binary.py | 884 +++
passlib/utils/{compat.py => compat/__init__.py} | 131 +-
passlib/utils/compat/_ordered_dict.py | 242 +
passlib/utils/decor.py | 233 +
passlib/utils/des.py | 857 +--
passlib/utils/handlers.py | 1640 ++++-
passlib/utils/md4.py | 267 +-
passlib/utils/pbkdf2.py | 386 +-
passlib/win32.py | 8 +-
setup.cfg | 2 +-
setup.py | 157 +-
tox.ini | 405 +-
191 files changed, 38161 insertions(+), 11002 deletions(-)
diff --cc debian/.git-dpm
index c82280a,0000000..7bf2d7f
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
- e2baea202293841719092c0dd984695571f157b3
- e2baea202293841719092c0dd984695571f157b3
- 5ee409eb1feb7d41f2a76c1cd40f824f89103a43
++9e5a4b32f8ff48670df80b7e97f88e3609ad6ca4
++9e5a4b32f8ff48670df80b7e97f88e3609ad6ca4
++4f8eb9d90fdaa143465e40bef41fd151466854dc
+4f8eb9d90fdaa143465e40bef41fd151466854dc
+python-passlib_1.7.0.orig.tar.gz
+a773592d9675c41465bd47c12f447e1100611703
+637909
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-Django-support.patch
index 52308c1,0000000..4906143
mode 100644,000000..100644
--- a/debian/patches/0001-Disable-Django-support.patch
+++ b/debian/patches/0001-Disable-Django-support.patch
@@@ -1,31 -1,0 +1,31 @@@
- From e2baea202293841719092c0dd984695571f157b3 Mon Sep 17 00:00:00 2001
++From 9e5a4b32f8ff48670df80b7e97f88e3609ad6ca4 Mon Sep 17 00:00:00 2001
+From: Brian May <bam at debian.org>
+Date: Sun, 3 Jan 2016 14:37:23 +1100
+Subject: Disable Django support
+
+It is currently broken with Django 1.9, see
+https://bitbucket.org/ecollins/passlib/issues/68/tests-fail-with-django-19
+---
+ passlib/ext/django/utils.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/passlib/ext/django/utils.py b/passlib/ext/django/utils.py
- index 863f11e..51830f4 100644
++index a83cb89..c828703 100644
+--- a/passlib/ext/django/utils.py
++++ b/passlib/ext/django/utils.py
- @@ -7,12 +7,9 @@ import logging; log = logging.getLogger(__name__)
- from weakref import WeakKeyDictionary
++@@ -9,12 +9,9 @@ import sys
++ import weakref
+ from warnings import warn
+ # site
+-try:
+- from django import VERSION as DJANGO_VERSION
+- log.debug("found django %r installation", DJANGO_VERSION)
+-except ImportError:
+- log.debug("django installation not found")
+- DJANGO_VERSION = ()
++log.debug("Django support disabled by Debian package")
++log.debug("See https://bitbucket.org/ecollins/passlib/issues/68/tests-fail-with-django-19")
++DJANGO_VERSION = ()
+ # pkg
++ from passlib import exc, registry
+ from passlib.context import CryptContext
- from passlib.exc import PasslibRuntimeWarning
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-passlib.git
More information about the Python-modules-commits
mailing list