[Python-modules-commits] [django-recurrence] 02/03: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository django-recurrence.

commit 0aee3b98c5bcf0198144f61ead5b2f92ff4ff2c8
Merge: 907e57e f185a5e
Author: Thomas Goirand <zigo at debian.org>
Date:   Fri Aug 5 10:51:33 2016 +0000

    merge patched into master

 debian/.git-dpm                                 |  4 +-
 debian/patches/0002-Fixes-for-Django-1.10.patch | 57 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 recurrence/compat.py                            | 21 +++++++++
 recurrence/fields.py                            |  3 +-
 5 files changed, 82 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index d37e22b,0000000..c05faa5
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 5cf7d7811e952aaa56835e72d59aab4ea5df79a4
- 5cf7d7811e952aaa56835e72d59aab4ea5df79a4
++f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1
++f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1
 +9701c091ddfd818b6a42e2b4dbdb4c3b28497833
 +9701c091ddfd818b6a42e2b4dbdb4c3b28497833
 +django-recurrence_1.3.0.orig.tar.gz
 +2141b1dd6ad6f722f9a9bf1492fc173e39764848
 +86835
diff --cc debian/patches/0002-Fixes-for-Django-1.10.patch
index 0000000,0000000..2b3394a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fixes-for-Django-1.10.patch
@@@ -1,0 -1,0 +1,57 @@@
++From f185a5e8c0a3ad7cfaf5f956d1aafc1c94aa8de1 Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Fri, 5 Aug 2016 10:50:55 +0000
++Subject: Fixes for Django 1.10
++
++django.db.models.fields.subclassing has gone away entirely
++(the release notes mention that SubfieldBase has gone, but
++don't mention the removal of Creator - I'm guessing it was
++viewed as an internal API).
++---
++ recurrence/compat.py | 21 +++++++++++++++++++++
++ recurrence/fields.py |  3 +--
++ 2 files changed, 22 insertions(+), 2 deletions(-)
++ create mode 100644 recurrence/compat.py
++
++diff --git a/recurrence/compat.py b/recurrence/compat.py
++new file mode 100644
++index 0000000..450537b
++--- /dev/null
+++++ b/recurrence/compat.py
++@@ -0,0 +1,21 @@
+++try:
+++    from django.db.models.fields.subclassing import Creator
+++except ImportError:
+++    # This class was removed in Django 1.10, so I've pulled it into
+++    # django-recurrence.
+++
+++    class Creator(object):
+++        """
+++        A placeholder class that provides a way to set the attribute
+++        on the model.
+++        """
+++        def __init__(self, field):
+++            self.field = field
+++
+++        def __get__(self, obj, type=None):
+++            if obj is None:
+++                return self
+++            return obj.__dict__[self.field.name]
+++
+++        def __set__(self, obj, value):
+++            obj.__dict__[self.field.name] = self.field.to_python(value)
++diff --git a/recurrence/fields.py b/recurrence/fields.py
++index 783d52b..d4652cb 100644
++--- a/recurrence/fields.py
+++++ b/recurrence/fields.py
++@@ -1,9 +1,8 @@
++ from django.db.models import fields
++ from django.utils.six import string_types
++-from django.db.models.fields.subclassing import Creator
++-
++ import recurrence
++ from recurrence import forms
+++from recurrence.compat import Creator
++ 
++ try:
++     from south.modelsinspector import add_introspection_rules
diff --cc debian/patches/series
index 71bd34f,0000000..7a7422a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-Python-3-compatible-exception-handling.patch
++0002-Fixes-for-Django-1.10.patch

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