[Python-modules-commits] [django-markupfield] 02/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 14bc4d0482b124970d6337a34b466a48c2e976e1
Merge: 0900aa9 53de3a7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Sep 1 13:42:51 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-required-attribute-for-Django-1.10-test.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 markupfield/tests/tests.py                         |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 9210845,0000000..cfffc00
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
- 73e1359a6e4a8aee7052cbb84e638d623a39396a
- 73e1359a6e4a8aee7052cbb84e638d623a39396a
++53de3a7a8478e5f515eca6de9b62e4c6411b089e
++53de3a7a8478e5f515eca6de9b62e4c6411b089e
 +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/0001-Add-expected-required-attribute-for-Django-1.10-test.patch
index 0000000,0000000..940ead3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-expected-required-attribute-for-Django-1.10-test.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 53de3a7a8478e5f515eca6de9b62e4c6411b089e Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 1 Sep 2016 13:40:35 +0200
++Subject: Add expected "required" attribute for Django 1.10 tests.
++
++Django 1.10 adds the "required" attribute if the field is also required.
++---
++ markupfield/tests/tests.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/markupfield/tests/tests.py b/markupfield/tests/tests.py
++index ac66783..20c8c38 100644
++--- a/markupfield/tests/tests.py
+++++ b/markupfield/tests/tests.py
++@@ -243,7 +243,7 @@ class MarkupWidgetTests(TestCase):
++         af = ArticleForm(instance=a)
++         self.assertHTMLEqual(
++             smart_text(af['normal_field']),
++-            '<textarea id="id_normal_field" rows="10" cols="40" '
+++            '<textarea id="id_normal_field" required rows="10" cols="40" '
++             'name="normal_field">**normal**</textarea>'
++         )
++ 
diff --cc debian/patches/series
index 0000000,0000000..307500b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-expected-required-attribute-for-Django-1.10-test.patch

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