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

[Brian May]

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

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

commit 237bcb3307cfd26d89e7cc8e87c9425450322da0
Merge: 56b0956 e2baea2
Author: Brian May <bam at debian.org>
Date:   Sun Jan 3 14:37:53 2016 +1100

    merge patched into master

 debian/.git-dpm                                  |  4 +--
 debian/patches/0001-Disable-Django-support.patch | 31 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 passlib/ext/django/utils.py                      |  9 +++----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index c8e82ce,0000000..2da9aa4
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
- 5ee409eb1feb7d41f2a76c1cd40f824f89103a43
- 5ee409eb1feb7d41f2a76c1cd40f824f89103a43
++e2baea202293841719092c0dd984695571f157b3
++e2baea202293841719092c0dd984695571f157b3
 +5ee409eb1feb7d41f2a76c1cd40f824f89103a43
 +5ee409eb1feb7d41f2a76c1cd40f824f89103a43
 +python-passlib_1.6.5.orig.tar.gz
 +ec7a4d6270306fa61c46d63cc2467a0f8b691c4b
 +417044
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Disable-Django-support.patch
index 0000000,0000000..52308c1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Disable-Django-support.patch
@@@ -1,0 -1,0 +1,31 @@@
++From e2baea202293841719092c0dd984695571f157b3 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
++--- 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
++ 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.context import CryptContext
++ from passlib.exc import PasslibRuntimeWarning
diff --cc debian/patches/series
index 0000000,0000000..41967ef
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Disable-Django-support.patch

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