[Python-modules-commits] [django-celery] 02/04: 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 django-celery.

commit 38a2c280ef9cf0ff8b961722326b32a387b507d5
Merge: 10ae13c 06566a5
Author: Brian May <bam at debian.org>
Date:   Thu Feb 23 07:54:04 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...nagement-command-handling-for-django-1.10.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 djcelery/management/base.py                        | 24 ++++++++++-
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ecce9b8,0000000..61c2083
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
- 39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
- 39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
++06566a57ca296c8ac4eb59c7b386f4dca817b555
++06566a57ca296c8ac4eb59c7b386f4dca817b555
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +django-celery_3.1.17.orig.tar.gz
 +64ca723de395f66decb5563e037c094ed723e45b
 +79615
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0010-Fix-management-command-handling-for-django-1.10.patch
index 0000000,0000000..ef0518e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0010-Fix-management-command-handling-for-django-1.10.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 06566a57ca296c8ac4eb59c7b386f4dca817b555 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Thu, 23 Feb 2017 07:52:29 +1100
++Subject: Fix management command handling for django >= 1.10
++
++Patch applied from upstream:
++https://patch-diff.githubusercontent.com/raw/celery/django-celery/pull/458.patch
++---
++ djcelery/management/base.py | 24 +++++++++++++++++++++++-
++ 1 file changed, 23 insertions(+), 1 deletion(-)
++
++diff --git a/djcelery/management/base.py b/djcelery/management/base.py
++index 11520f1..b3f386d 100644
++--- a/djcelery/management/base.py
+++++ b/djcelery/management/base.py
++@@ -57,7 +57,29 @@ patch_thread_ident()
++ 
++ 
++ class CeleryCommand(BaseCommand):
++-    options = BaseCommand.option_list
+++    options = ()
+++    if hasattr(BaseCommand, 'option_list'):
+++        options = BaseCommand.option_list
+++    else:
+++        def add_arguments(self, parser):
+++            option_typemap = {
+++                "string": str,
+++                "int": int,
+++                "float": float
+++            }
+++            for opt in self.option_list:
+++                option = {k: v
+++                          for k, v in opt.__dict__.items()
+++                          if v is not None}
+++                flags = (option.get("_long_opts", []) +
+++                         option.get("_short_opts", []))
+++                del option["_long_opts"]
+++                del option["_short_opts"]
+++                if "type" in option:
+++                    opttype = option["type"]
+++                    option["type"] = option_typemap.get(opttype, opttype)
+++                parser.add_argument(*flags, **option)
+++
++     skip_opts = ['--app', '--loader', '--config', '--no-color']
++     requires_model_validation = VALIDATE_MODELS
++     keep_base_opts = False
diff --cc debian/patches/series
index db171f5,0000000..14aafca
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
 +fix_dependencies.patch
 +no-issues.patch
 +fix_autodiscover.patch
 +privacy.patch
 +0005-Fix-python3-issues.patch
 +0006-Fix-caching-with-Django-1.9.patch
 +0007-Fix-get_model-with-Django-1.9.patch
 +0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
 +0009-django-1.10-fix-access-to-_default_manager.patch
++0010-Fix-management-command-handling-for-django-1.10.patch

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