Date: Tuesday, March 5, 2019 @ 08:12:38 Author: eworm Revision: 437711
upgpkg: python-markdown 3.0.1-2 Fix double escaping of block code Added: python-markdown/trunk/0001-fix-double-escaping.patch Modified: python-markdown/trunk/PKGBUILD --------------------------------+ 0001-fix-double-escaping.patch | 32 ++++++++++++++++++++++++++++++++ PKGBUILD | 10 +++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) Added: 0001-fix-double-escaping.patch =================================================================== --- 0001-fix-double-escaping.patch (rev 0) +++ 0001-fix-double-escaping.patch 2019-03-05 08:12:38 UTC (rev 437711) @@ -0,0 +1,32 @@ +From f43f515333519b44f76746d80e0e77876bf76804 Mon Sep 17 00:00:00 2001 +From: facelessuser <[email protected]> +Date: Sun, 7 Oct 2018 12:29:05 -0600 +Subject: Fix double escaping of block code + +Ref #725 +diff --git a/markdown/extensions/codehilite.py b/markdown/extensions/codehilite.py +index d204ebf7..712618f6 100644 +--- a/markdown/extensions/codehilite.py ++++ b/markdown/extensions/codehilite.py +@@ -200,13 +200,20 @@ def _parseHeader(self): + class HiliteTreeprocessor(Treeprocessor): + """ Hilight source code in code blocks. """ + ++ def code_unescape(self, text): ++ """Unescape code.""" ++ text = text.replace("&", "&") ++ text = text.replace("<", "<") ++ text = text.replace(">", ">") ++ return text ++ + def run(self, root): + """ Find code blocks and store in htmlStash. """ + blocks = root.iter('pre') + for block in blocks: + if len(block) == 1 and block[0].tag == 'code': + code = CodeHilite( +- block[0].text, ++ self.code_unescape(block[0].text), + linenums=self.config['linenums'], + guess_lang=self.config['guess_lang'], + css_class=self.config['css_class'], Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-05 07:42:27 UTC (rev 437710) +++ PKGBUILD 2019-03-05 08:12:38 UTC (rev 437711) @@ -8,7 +8,7 @@ pkgname=('python-markdown' 'python2-markdown') _pkgbasename=Markdown pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python implementation of John Gruber's Markdown." arch=('any') url='https://python-markdown.github.io/' @@ -16,13 +16,17 @@ depends=('python') makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools') checkdepends=('python-yaml' 'python2-yaml') -source=("https://files.pythonhosted.org/packages/source/M/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz";) -md5sums=('72219f46ca440b657bf227500731bdf1') +source=("https://files.pythonhosted.org/packages/source/M/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz"; + '0001-fix-double-escaping.patch') +md5sums=('72219f46ca440b657bf227500731bdf1' + '8ecbe4dc23be24a49bff904126535857') prepare() { # bug in 2.4, some DOS line endings slipped in find "$_pkgbasename-$pkgver/" -name '*py' -exec sed -i 's|\r||g' {} + + patch -d "$_pkgbasename-$pkgver/" -Np1 < "${srcdir}"/0001-fix-double-escaping.patch + cp -r $_pkgbasename-$pkgver "$srcdir/python2-markdown" cd "$srcdir/python2-markdown" find "$srcdir/python2-markdown" -name '*py' -exec sed -i 's|#!/usr/bin/env python$|&2|' {} +
