[Python-modules-commits] [python-django] 07/16: merge patched-debian/sid into debian/sid

[Brian May]

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

bam pushed a commit to branch debian/sid
in repository python-django.

commit ff98f96ae6dc753b3c696a1138bf4a03e84d0921
Merge: f996c3d d7371c7
Author: Brian May <brian at microcomaustralia.com.au>
Date:   Sun Oct 11 12:14:46 2015 +1100

    merge patched-debian/sid into debian/sid

 debian/.git-dpm                                    |  4 +--
 ...4-Added-a-dummy-class-for-HTMLParserError.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 django/utils/html_parser.py                        |  7 ++++-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7adb084,0000000..77a183b
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
- b9e955846033c2b3c7b751cf0504e703304d43d6
- b9e955846033c2b3c7b751cf0504e703304d43d6
++d7371c714045ad04e8c289b5948992eccb988c8e
++d7371c714045ad04e8c289b5948992eccb988c8e
 +d16a450f271fa5fe3ef10b43f47307ed95b793bb
 +d16a450f271fa5fe3ef10b43f47307ed95b793bb
 +python-django_1.7.9.orig.tar.gz
 +473599c2e2810a30bb86fd9c730ef52f23e5f709
 +7605194
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
index 0000000,0000000..95086b7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Added-a-dummy-class-for-HTMLParserError.patch
@@@ -1,0 -1,0 +1,34 @@@
++From d7371c714045ad04e8c289b5948992eccb988c8e Mon Sep 17 00:00:00 2001
++From: Brian May <brian at microcomaustralia.com.au>
++Date: Sun, 11 Oct 2015 12:12:44 +1100
++Subject: Added a dummy class for HTMLParserError.
++
++Fix problem introduced by python-3.5 and causes FTBFS for several Django
++related packages.
++
++Backport of upstream fix.
++https://github.com/django/django/commit/b07aa52e8a8e4c7fdc7265f75ce2e7992e657ae9
++
++Closes: #796104
++---
++ django/utils/html_parser.py | 7 ++++++-
++ 1 file changed, 6 insertions(+), 1 deletion(-)
++
++diff --git a/django/utils/html_parser.py b/django/utils/html_parser.py
++index efe5422..ab1f654 100644
++--- a/django/utils/html_parser.py
+++++ b/django/utils/html_parser.py
++@@ -9,7 +9,12 @@ use_workaround = (
++     (current_version >= (3, 0) and current_version < (3, 2, 3))
++ )
++ 
++-HTMLParseError = _html_parser.HTMLParseError
+++try:
+++    HTMLParseError = _html_parser.HTMLParseError
+++except AttributeError:
+++    # create a dummy class for Python 3.5+ where it's been removed
+++    class HTMLParseError(Exception):
+++        pass
++ 
++ if not use_workaround:
++     if current_version >= (3, 4):
diff --cc debian/patches/series
index c73a668,0000000..32bda2e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +02_disable-sources-in-sphinxdoc.diff
 +03_manpage.diff
 +06_use_debian_geoip_database_as_default.diff
++0004-Added-a-dummy-class-for-HTMLParserError.patch

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