[Python-modules-commits] [mako] 02/03: merge patched into master
Piotr Ożarowski
piotr at moszumanska.debian.org
Tue Feb 7 21:31:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository mako.
commit 7ccd2b3889c80c5142fbe5f88c1791cfe37c3f9d
Merge: d38e240 2f48e82
Author: Piotr Ożarowski <piotr at debian.org>
Date: Tue Feb 7 22:22:35 2017 +0100
merge patched into master
debian/.git-dpm | 4 +--
.../0001-update-tests-for-Pygments-2.2.patch | 31 ++++++++++++++++++++++
debian/patches/series | 1 +
test/test_exceptions.py | 4 +--
4 files changed, 36 insertions(+), 4 deletions(-)
diff --cc debian/.git-dpm
index d02b54e,0000000..b05a32b
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
- 5d1ccaf2c078af06033d728a7b5f7e3983a2882f
- 5d1ccaf2c078af06033d728a7b5f7e3983a2882f
++2f48e82d793202903f52b65cc0e345b4efa36588
++2f48e82d793202903f52b65cc0e345b4efa36588
+5d1ccaf2c078af06033d728a7b5f7e3983a2882f
+5d1ccaf2c078af06033d728a7b5f7e3983a2882f
+mako_1.0.6+ds1.orig.tar.gz
+d9e272c2925dd313d4546e2f231a738e2c2fc31a
+272388
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-update-tests-for-Pygments-2.2.patch
index 0000000,0000000..59e9e9e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-update-tests-for-Pygments-2.2.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 2f48e82d793202903f52b65cc0e345b4efa36588 Mon Sep 17 00:00:00 2001
++From: Gilles Filippini <pini at debian.org>
++Date: Tue, 7 Feb 2017 22:21:58 +0100
++Subject: update tests for Pygments 2.2
++
++---
++ test/test_exceptions.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test/test_exceptions.py b/test/test_exceptions.py
++index 8321b25..bcaae3b 100644
++--- a/test/test_exceptions.py
+++++ b/test/test_exceptions.py
++@@ -91,7 +91,7 @@ ${u'привет'}
++ assert "".encode(sys.getdefaultencoding(),
++ 'htmlentityreplace') in html_error
++ else:
++- assert 'u''\
+++ assert '''\
++ 'привет'\
++ ''</span><span class="cp">}</span>'.encode(
++ sys.getdefaultencoding(),
++@@ -220,7 +220,7 @@ ${foobar}
++ assert ''привет'</span>' in \
++ l.get_template("foo.html").render().decode('utf-8')
++ else:
++- assert 'u'прив'\
+++ assert ''прив'\
++ 'ет'</span>' in \
++ l.get_template("foo.html").render().decode('utf-8')
++
diff --cc debian/patches/series
index 0000000,0000000..f5b3625
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-update-tests-for-Pygments-2.2.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mako.git
More information about the Python-modules-commits
mailing list