[Python-modules-commits] [django-polymorphic] 12/14: 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 django-polymorphic.

commit 9bb78ab6273bfb1fc37d27785e6acfdd7bb16d9f
Merge: 2115dd4 6b4c202
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Sep 3 22:23:32 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-managers-only-works-for-abstract-classes.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 polymorphic/tests.py                               |  3 +++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 5b5efc9,0000000..f0a1fe9
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
- 7c06e18c7a99cafe5c276c9ea57dfb63c1796644
- 7c06e18c7a99cafe5c276c9ea57dfb63c1796644
++6b4c202531856fd61faa92f1ab83893c6ffbe886
++6b4c202531856fd61faa92f1ab83893c6ffbe886
 +9cbbfe8633539f380d08c18903622880496bcbee
 +9cbbfe8633539f380d08c18903622880496bcbee
 +django-polymorphic_1.0.orig.tar.gz
 +8790a24dd9e0d1fc65297cb3b4cf4083a44e5b9f
 +89410
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Inheriting-managers-only-works-for-abstract-classes.patch
index 0000000,0000000..c06e152
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Inheriting-managers-only-works-for-abstract-classes.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 6b4c202531856fd61faa92f1ab83893c6ffbe886 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Sat, 3 Sep 2016 22:21:23 +0200
++Subject: Inheriting managers only works for abstract classes.
++
++The base class from which a manager shall be inherited has to be abstract. This
++is a requirement by Django that has not been taken into accoutn by upstream yet.
++---
++ polymorphic/tests.py | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/polymorphic/tests.py b/polymorphic/tests.py
++index 379e955..d2db259 100644
++--- a/polymorphic/tests.py
+++++ b/polymorphic/tests.py
++@@ -211,6 +211,9 @@ class MROBase1(ShowFieldType, PolymorphicModel):
++     objects = MyManager()
++     field1 = models.CharField(max_length=10)  # needed as MyManager uses it
++ 
+++    class Meta:
+++        abstract = True
+++
++ 
++ class MROBase2(MROBase1):
++     pass  # Django vanilla inheritance does not inherit MyManager as _default_manager here
diff --cc debian/patches/series
index 7f0b5b6,0000000..5ae6aef
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-use-local-objects.inv-where-possible.patch
++0002-Inheriting-managers-only-works-for-abstract-classes.patch

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