[Python-modules-commits] [celery] 02/06: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository celery.

commit d6fe83036497a4f15e729d41522561032b873d47
Merge: 662d099 1b459f8
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Oct 16 11:53:38 2015 +0200

    merge patched into master

 celery/tests/case.py                               | 13 ++++++---
 debian/.git-dpm                                    |  4 +--
 ...rove-the-magic-module-check-Closes-801640.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index cb90b6d,0000000..09fe87b
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
- aab8fc57c8e78ee3622148c20294cc7ae953d4ef
- aab8fc57c8e78ee3622148c20294cc7ae953d4ef
++1b459f8c94e369f2c69416347096d993ff5b5222
++1b459f8c94e369f2c69416347096d993ff5b5222
 +1ca0fad35008a3f2554cd40b0851196a42e715e8
 +1ca0fad35008a3f2554cd40b0851196a42e715e8
 +celery_3.1.18.orig.tar.gz
 +77c0e74e8661759d76c0169248b92510a4656100
 +1298756
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Improve-the-magic-module-check-Closes-801640.patch
index 0000000,0000000..d1635a3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Improve-the-magic-module-check-Closes-801640.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 1b459f8c94e369f2c69416347096d993ff5b5222 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact at ionelmc.ro>
++Date: Thu, 20 Aug 2015 18:49:27 +0300
++Subject: Improve the magic module check (Closes: #801640).
++
++---
++ celery/tests/case.py | 13 +++++++++----
++ 1 file changed, 9 insertions(+), 4 deletions(-)
++
++diff --git a/celery/tests/case.py b/celery/tests/case.py
++index 0bc0c5d..801ff61 100644
++--- a/celery/tests/case.py
+++++ b/celery/tests/case.py
++@@ -234,10 +234,15 @@ def _is_magic_module(m):
++     # will load _tkinter and other shit when touched.
++ 
++     # pyflakes refuses to accept 'noqa' for this isinstance.
++-    cls, modtype = m.__class__, types.ModuleType
++-    return (cls is not modtype and (
++-        '__getattr__' in vars(m.__class__) or
++-        '__getattribute__' in vars(m.__class__)))
+++    cls, modtype = type(m), types.ModuleType
+++    try:
+++        variables = vars(cls)
+++    except TypeError:
+++        return True
+++    else:
+++        return (cls is not modtype and (
+++            '__getattr__' in variables or
+++            '__getattribute__' in variables))
++ 
++ 
++ class _AssertWarnsContext(_AssertRaisesBaseContext):
diff --cc debian/patches/series
index f608017,0000000..e81b1ab
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +drop_downgrade.patch
 +lsb-init.patch
 +intersphinx.patch
 +disable_unstable_tests.patch
 +privacy.patch
 +fix_test_typos.patch
++0007-Improve-the-magic-module-check-Closes-801640.patch

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