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

commit 32e2d865d99f267fea62d5b6af130f838d044d9b
Merge: 17026dc 82fc0be
Author: Brian May <bam at debian.org>
Date:   Mon Oct 26 09:08:12 2015 +1100

    merge patched into master

 debian/.git-dpm                              |  4 +--
 debian/patches/0005-Fix-python3-issues.patch | 49 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 djcelery/loaders.py                          |  3 +-
 djcelery/views.py                            |  6 ++--
 5 files changed, 57 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index c6273e0,0000000..6e8c082
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
- 7f2c5bfa8f90e6b4dd04102979695576b3881164
- 7f2c5bfa8f90e6b4dd04102979695576b3881164
++82fc0be53a36aebd4ca981f7e6bf2d63b1c5be2a
++82fc0be53a36aebd4ca981f7e6bf2d63b1c5be2a
 +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/0005-Fix-python3-issues.patch
index 0000000,0000000..dd09786
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Fix-python3-issues.patch
@@@ -1,0 -1,0 +1,49 @@@
++From 82fc0be53a36aebd4ca981f7e6bf2d63b1c5be2a Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Mon, 26 Oct 2015 09:07:25 +1100
++Subject: Fix python3 issues
++
++Reported upsteam https://github.com/celery/django-celery/issues/342
++---
++ djcelery/loaders.py | 3 ++-
++ djcelery/views.py   | 6 +++---
++ 2 files changed, 5 insertions(+), 4 deletions(-)
++
++diff --git a/djcelery/loaders.py b/djcelery/loaders.py
++index c86455a..61c6d04 100644
++--- a/djcelery/loaders.py
+++++ b/djcelery/loaders.py
++@@ -201,7 +201,8 @@ def find_related_module(app, related_name):
++         return
++ 
++     try:
++-        imp.find_module(related_name, app_path)
+++        file, _, _ = imp.find_module(related_name, app_path)
+++        file.close()
++     except ImportError:
++         return
++ 
++diff --git a/djcelery/views.py b/djcelery/views.py
++index 34cb307..4d07e0a 100644
++--- a/djcelery/views.py
+++++ b/djcelery/views.py
++@@ -34,7 +34,7 @@ def task_view(task):
++         kwargs = kwdict(request.method == 'POST' and
++                         request.POST or request.GET)
++         # no multivalue
++-        kwargs = dict(((k, v) for k, v in kwargs.iteritems()), **options)
+++        kwargs = dict(((k, v) for k, v in kwargs.items()), **options)
++         result = task.apply_async(kwargs=kwargs)
++         return JsonResponse({'ok': 'true', 'task_id': result.task_id})
++ 
++@@ -78,8 +78,8 @@ def task_status(request, task_id):
++ 
++ def registered_tasks(request):
++     """View returning all defined tasks as a JSON object."""
++-    return JsonResponse({'regular': tasks.regular().keys(),
++-                         'periodic': tasks.periodic().keys()})
+++    return JsonResponse({'regular': list(tasks.regular().keys()),
+++                         'periodic': list(tasks.periodic().keys())})
++ 
++ 
++ def task_webhook(fun):
diff --cc debian/patches/series
index 5ef1933,0000000..f58b71d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +fix_dependencies.patch
 +no-issues.patch
 +fix_autodiscover.patch
 +privacy.patch
++0005-Fix-python3-issues.patch

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