[Python-modules-commits] [django-celery] 02/04: merge patched into master
Thomas Goirand
zigo at moszumanska.debian.org
Mon Aug 8 09:01:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
zigo pushed a commit to branch master
in repository django-celery.
commit dc6d2de9336dc816fb6b2d72d11e1ccead86ae9e
Merge: c83181f 39098cc
Author: Thomas Goirand <zigo at debian.org>
Date: Mon Aug 8 08:52:45 2016 +0000
merge patched into master
debian/.git-dpm | 4 ++--
...-fix-django.conf.urls.patterns-is-removed.patch | 13 ++++++++-----
...jango-1.10-fix-access-to-_default_manager.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
djcelery/schedulers.py | 2 +-
5 files changed, 34 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index 29e1e2f,0000000..ecce9b8
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
- 36d40e547b095a2979da7ef5883d84ea90a48cdf
- 36d40e547b095a2979da7ef5883d84ea90a48cdf
++39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
++39098cc288ef5f15f9f52a83339a5d3bc59ba6cd
+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/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
index a4dcc8b,0000000..5d80af8
mode 100644,000000..100644
--- a/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
+++ b/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
@@@ -1,65 -1,0 +1,68 @@@
- Description: [django 1.10] fix django.conf.urls.patterns() is removed
- Author: Thomas Goirand <zigo at debian.org>
- Forwarded: no
- Bug-Debian: https://bugs.debian.org/828642
++From 36d40e547b095a2979da7ef5883d84ea90a48cdf Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
+Date: Tue, 2 Aug 2016 22:30:22 +0000
- Last-Update: 2016-08-03
++Subject: django 1.10 fix django.conf.urls.patterns() is removed
++
++---
++ djcelery/urls.py | 10 +++-------
++ tests/urls.py | 12 +++---------
++ 2 files changed, 6 insertions(+), 16 deletions(-)
+
+diff --git a/djcelery/urls.py b/djcelery/urls.py
+index b6e5cad..2178bdd 100644
+--- a/djcelery/urls.py
++++ b/djcelery/urls.py
+@@ -13,20 +13,16 @@ URLs defined for celery.
+ """
+ from __future__ import absolute_import, unicode_literals
+
+-try:
+- from django.conf.urls import patterns, url
+-except ImportError: # deprecated since Django 1.4
+- from django.conf.urls.defaults import patterns, url # noqa
++from django.conf.urls import url
+
+ from . import views
+
+ task_pattern = r'(?P<task_id>[\w\d\-\.]+)'
+
+-urlpatterns = patterns(
+- '',
++urlpatterns = [
+ url(r'^%s/done/?$' % task_pattern, views.is_task_successful,
+ name='celery-is_task_successful'),
+ url(r'^%s/status/?$' % task_pattern, views.task_status,
+ name='celery-task_status'),
+ url(r'^tasks/?$', views.registered_tasks, name='celery-tasks'),
+-)
++]
+diff --git a/tests/urls.py b/tests/urls.py
+index 9d72f70..b8ab1c4 100644
+--- a/tests/urls.py
++++ b/tests/urls.py
+@@ -1,17 +1,11 @@
+-try:
+- from django.conf.urls import (patterns, include, url,
+- handler500, handler404)
+-except ImportError:
+- from django.conf.urls.defaults import (patterns, include, url, # noqa
+- handler500, handler404)
++from django.conf.urls import (include, url, handler500, handler404)
+ from djcelery.views import apply
+
+ # Uncomment the next two lines to enable the admin:
+ # from django.contrib import admin
+ # admin.autodiscover()
+
+-urlpatterns = patterns(
+- '',
++urlpatterns = [
+ # Example:
+ # (r'^tests/', include('tests.foo.urls')),
+
+@@ -24,4 +18,4 @@ urlpatterns = patterns(
+ url(r'^apply/(?P<task_name>.+?)/', apply, name='celery-apply'),
+ url(r'^celery/', include('djcelery.urls')),
+
+-)
++]
diff --cc debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch
index 0000000,0000000..5142164
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-django-1.10-fix-access-to-_default_manager.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 39098cc288ef5f15f9f52a83339a5d3bc59ba6cd Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Mon, 8 Aug 2016 08:52:08 +0000
++Subject: django 1.10: fix access to _default_manager
++
++---
++ djcelery/schedulers.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/djcelery/schedulers.py b/djcelery/schedulers.py
++index c937743..acbc0dd 100644
++--- a/djcelery/schedulers.py
+++++ b/djcelery/schedulers.py
++@@ -95,7 +95,7 @@ class ModelEntry(ScheduleEntry):
++ def save(self):
++ # Object may not be synchronized, so only
++ # change the fields we care about.
++- obj = self.model._default_manager.get(pk=self.model.pk)
+++ obj = self.model._meta.default_manager.get(pk=self.model.pk)
++ for field in self.save_fields:
++ setattr(obj, field, getattr(self.model, field))
++ obj.last_run_at = make_aware(obj.last_run_at)
diff --cc debian/patches/series
index f115bcd,0000000..db171f5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
+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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-celery.git
More information about the Python-modules-commits
mailing list