[Python-modules-commits] [python-markdown] 04/05: merge patched into master

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository python-markdown.

commit 4c1c4385a4b9c3cbcd5444ca2979fed32c9e217a
Merge: 5ef3723 712c5f1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Nov 13 17:51:09 2015 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ng-of-characters-after-backtick-in-tables.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 markdown/extensions/tables.py                      |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 4b4c3c4,0000000..92f479f
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
- 68e168093a0a374d305b0faa5e3b79ef8d52a3eb
- 68e168093a0a374d305b0faa5e3b79ef8d52a3eb
++712c5f12dc8bbc72895f49231ed2ccd716fc9694
++712c5f12dc8bbc72895f49231ed2ccd716fc9694
 +68e168093a0a374d305b0faa5e3b79ef8d52a3eb
 +68e168093a0a374d305b0faa5e3b79ef8d52a3eb
 +python-markdown_2.6.4.orig.tar.gz
 +79df1b522b67c98ef70efaeda3ce6d0e35850910
 +301632
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-handling-of-characters-after-backtick-in-tables.patch
index 0000000,0000000..28278ae
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-handling-of-characters-after-backtick-in-tables.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 712c5f12dc8bbc72895f49231ed2ccd716fc9694 Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++Date: Sat, 7 Nov 2015 20:32:49 +0300
++Subject: Fix handling of characters after backtick in tables.
++
++Fixes #440. Thanks @jandecaluwe for the bug report.
++---
++ markdown/extensions/tables.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/markdown/extensions/tables.py b/markdown/extensions/tables.py
++index 494aaeb..39c09a4 100644
++--- a/markdown/extensions/tables.py
+++++ b/markdown/extensions/tables.py
++@@ -119,7 +119,7 @@ class TableProcessor(BlockProcessor):
++                     groups = match.groups()
++                     delim = groups[1]  # the code block delimeter (ie 1 or more backticks)
++                     row_contents = groups[2]  # the text contained inside the code block
++-                    i += match.start(4)  # jump pointer to the beginning of the rest of the text (group #4)
+++                    i += match.start(4) - 1  # jump pointer to the beginning of the rest of the text (group #4)
++                     element = delim + row_contents + delim  # reinstert backticks
++                     current += element
++             i += 1
diff --cc debian/patches/series
index 0000000,0000000..858f8ff
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-handling-of-characters-after-backtick-in-tables.patch

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