[Python-modules-commits] [django-polymorphic] 09/17: merge patched-experimental into experimental

[Michael Fladischer]

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

fladi pushed a commit to branch experimental
in repository django-polymorphic.

commit 6482fb79e422e5019a62d3ceee0dce2bc2836b80
Merge: c81226b b03e249
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Mar 6 12:26:13 2017 +0100

    merge patched-experimental into experimental

 debian/.git-dpm                                    |  4 +--
 ...002-Replace-force_unicode-with-force_text.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/_ext/djangoext/docstrings.py                  |  6 ++--
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 5013e87,0000000..24b2142
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
- 9a31c10573f7bd20a171c7f6e74bd058e29f3f77
- 9a31c10573f7bd20a171c7f6e74bd058e29f3f77
++b03e249f8b3d9030a19704563afb2cd638325673
++b03e249f8b3d9030a19704563afb2cd638325673
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +django-polymorphic_1.1.orig.tar.gz
 +6abe4a9df5041bea9e67211f988c0b4615f9d983
 +96348
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Replace-force_unicode-with-force_text.patch
index 0000000,0000000..4f0a62d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Replace-force_unicode-with-force_text.patch
@@@ -1,0 -1,0 +1,35 @@@
++From b03e249f8b3d9030a19704563afb2cd638325673 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Mon, 6 Mar 2017 12:24:52 +0100
++Subject: Replace force_unicode with force_text.
++
++The helper function `force_text` supersedes `force_unicode` as the later is only
++applicable in a Python2 context.
++---
++ docs/_ext/djangoext/docstrings.py | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/docs/_ext/djangoext/docstrings.py b/docs/_ext/djangoext/docstrings.py
++index 5ae5bf1..b626b73 100644
++--- a/docs/_ext/djangoext/docstrings.py
+++++ b/docs/_ext/djangoext/docstrings.py
++@@ -4,7 +4,7 @@ Based on http://djangosnippets.org/snippets/2533/
++ """
++ import django
++ from django.utils.html import strip_tags
++-from django.utils.encoding import force_unicode
+++from django.utils.encoding import force_text
++ import inspect
++ 
++ 
++@@ -20,8 +20,8 @@ def improve_model_docstring(app, what, name, obj, options, lines):
++             model_fields = obj._meta._fields()
++ 
++         for field in model_fields:
++-            help_text = strip_tags(force_unicode(field.help_text))
++-            verbose_name = force_unicode(field.verbose_name).capitalize()
+++            help_text = strip_tags(force_text(field.help_text))
+++            verbose_name = force_text(field.verbose_name).capitalize()
++ 
++             # Add parameter
++             if help_text:
diff --cc debian/patches/series
index 7f0b5b6,0000000..077350e
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-Replace-force_unicode-with-force_text.patch

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