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

commit ac3e1401ff8b594890aa26296775791836b038d4
Merge: 14bc4d0 b222996
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Sep 1 14:04:54 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...t-instance-to-formfield_for_dbfield-metho.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 markupfield/tests/tests.py                         |  5 ++--
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index cfffc00,0000000..eb8e06d
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
- 53de3a7a8478e5f515eca6de9b62e4c6411b089e
- 53de3a7a8478e5f515eca6de9b62e4c6411b089e
++b222996a7d9bb5447bb7e7202c5ec517ee4549cd
++b222996a7d9bb5447bb7e7202c5ec517ee4549cd
 +73e1359a6e4a8aee7052cbb84e638d623a39396a
 +73e1359a6e4a8aee7052cbb84e638d623a39396a
 +django-markupfield_1.4.0.orig.tar.gz
 +26bc900bad3bd6213b58215c6e7852ce424e9bc1
 +15730
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Pass-request-instance-to-formfield_for_dbfield-metho.patch
index 0000000,0000000..2a959fe
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Pass-request-instance-to-formfield_for_dbfield-metho.patch
@@@ -1,0 -1,0 +1,34 @@@
++From b222996a7d9bb5447bb7e7202c5ec517ee4549cd Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 1 Sep 2016 14:04:11 +0200
++Subject: Pass request instance to formfield_for_dbfield method.
++
++This is required by Django 1.10.
++---
++ markupfield/tests/tests.py | 5 +++--
++ 1 file changed, 3 insertions(+), 2 deletions(-)
++
++diff --git a/markupfield/tests/tests.py b/markupfield/tests/tests.py
++index 20c8c38..f7821e5 100644
++--- a/markupfield/tests/tests.py
+++++ b/markupfield/tests/tests.py
++@@ -2,7 +2,7 @@ from __future__ import unicode_literals
++ 
++ import json
++ 
++-from django.test import TestCase
+++from django.test import TestCase, RequestFactory
++ from django.core import serializers
++ from django.utils.encoding import smart_text
++ from markupfield.markup import DEFAULT_MARKUP_TYPES
++@@ -280,8 +280,9 @@ class MarkupWidgetTests(TestCase):
++         # borrows from regressiontests/admin_widgets/tests.py
++         from django.contrib import admin
++         ma = admin.ModelAdmin(Post, admin.site)
+++        req = RequestFactory().get('/')
++         self.assertTrue(isinstance(ma.formfield_for_dbfield(
++-            Post._meta.get_field('body')).widget, AdminMarkupTextareaWidget))
+++            Post._meta.get_field('body'), req).widget, AdminMarkupTextareaWidget))
++ 
++ 
++ class MarkupFieldFormSaveTests(TestCase):
diff --cc debian/patches/series
index 307500b,0000000..4ba65f7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Add-expected-required-attribute-for-Django-1.10-test.patch
++0002-Pass-request-instance-to-formfield_for_dbfield-metho.patch

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