[Python-modules-commits] [drf-extensions] 04/05: 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 drf-extensions.

commit 28e3524b3073f98bac36e2fb84dd922596277220
Merge: a85a430 ae1436b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 1 13:10:57 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...0001-Make-backdoc-compatible-with-Python3.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/backdoc.py                                    |  6 ++--
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 550fdb5,0000000..1b540f0
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
- ecfa9c6fc11a840b5f5fb57de2aae98382ecdba2
- ecfa9c6fc11a840b5f5fb57de2aae98382ecdba2
++ae1436b7c70d132c5a6e02520235a0697ee4f588
++ae1436b7c70d132c5a6e02520235a0697ee4f588
 +ecfa9c6fc11a840b5f5fb57de2aae98382ecdba2
 +ecfa9c6fc11a840b5f5fb57de2aae98382ecdba2
 +drf-extensions_0.3.1.orig.tar.gz
 +ae6d29937594f87bf560d887261eda685c866560
 +156153
diff --cc debian/patches/0001-Make-backdoc-compatible-with-Python3.patch
index 0000000,0000000..b032567
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Make-backdoc-compatible-with-Python3.patch
@@@ -1,0 -1,0 +1,40 @@@
++From ae1436b7c70d132c5a6e02520235a0697ee4f588 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 1 Mar 2017 13:09:42 +0100
++Subject: Make backdoc compatible with Python3.
++
++---
++ docs/backdoc.py | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/docs/backdoc.py b/docs/backdoc.py
++index 2875eea..51fb75c 100644
++--- a/docs/backdoc.py
+++++ b/docs/backdoc.py
++@@ -2265,7 +2265,7 @@ def main(argv=None):
++ 
++     if opts.link_patterns_file:
++         link_patterns = []
++-        f = open(opts.link_patterns_file)
+++        f = codecs.open(opts.link_patterns_file, 'r', opts.encoding)
++         try:
++             for i, line in enumerate(f.readlines()):
++                 if not line.strip(): continue
++@@ -2670,7 +2670,7 @@ class BackDoc(object):
++ 
++     def run(self, argv):
++         kwargs = self.get_kwargs(argv)
++-        self.stdout.write(self.get_result_html(**kwargs).encode('utf-8'))
+++        self.stdout.write(self.get_result_html(**kwargs))
++ 
++     def get_kwargs(self, argv):
++         parsed = dict(self.parser.parse_args(argv)._get_kwargs())
++@@ -2680,7 +2680,7 @@ class BackDoc(object):
++         kwargs = {}
++         kwargs['title'] = force_text(parsed.get('title') or 'Documentation')
++         if parsed.get('source'):
++-            kwargs['markdown_src'] = open(parsed['source'], 'r').read()
+++            kwargs['markdown_src'] = codecs.open(parsed['source'], 'r', 'utf-8').read()
++         else:
++             kwargs['markdown_src'] = self.stdin.read()
++         kwargs['markdown_src'] = force_text(kwargs['markdown_src'] or '')
diff --cc debian/patches/series
index 0000000,0000000..abccc20
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Make-backdoc-compatible-with-Python3.patch

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