[arch-commits] Commit in python-markdown/trunk (2 files)

[Kyle Keen]

    Date: Saturday, May 18, 2019 @ 12:48:25
  Author: kkeen
Revision: 467859

upgpkg: python-markdown 3.1-1

Modified:
  python-markdown/trunk/PKGBUILD
Deleted:
  python-markdown/trunk/0001-fix-double-escaping.patch

--------------------------------+
 0001-fix-double-escaping.patch |   32 --------------------------------
 PKGBUILD                       |   17 ++++++++---------
 2 files changed, 8 insertions(+), 41 deletions(-)

Deleted: 0001-fix-double-escaping.patch
===================================================================
--- 0001-fix-double-escaping.patch	2019-05-18 10:07:22 UTC (rev 467858)
+++ 0001-fix-double-escaping.patch	2019-05-18 12:48:25 UTC (rev 467859)
@@ -1,32 +0,0 @@
-From f43f515333519b44f76746d80e0e77876bf76804 Mon Sep 17 00:00:00 2001
-From: facelessuser <faceless.shop at gmail.com>
-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-05-18 10:07:22 UTC (rev 467858)
+++ PKGBUILD	2019-05-18 12:48:25 UTC (rev 467859)
@@ -7,8 +7,8 @@
 pkgbase=python-markdown
 pkgname=('python-markdown' 'python2-markdown')
 _pkgbasename=Markdown
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.1
+pkgrel=1
 pkgdesc="Python implementation of John Gruber's Markdown."
 arch=('any')
 url='https://python-markdown.github.io/'
@@ -16,16 +16,15 @@
 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"
-        '0001-fix-double-escaping.patch')
-md5sums=('72219f46ca440b657bf227500731bdf1'
-         '8ecbe4dc23be24a49bff904126535857')
+source=("https://files.pythonhosted.org/packages/source/M/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz")
+md5sums=('ef00dbf71b44d60a8e75b0315eaf6944')
 
 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
+  # ImportError: No module named pkg_resources
+  sed -i 's/^from pkg_resources.*$/import packaging.version/' "$_pkgbasename-$pkgver/markdown/__init__.py"
 
   cp -r $_pkgbasename-$pkgver "$srcdir/python2-markdown"
   cd "$srcdir/python2-markdown"
@@ -62,11 +61,11 @@
 }
 
 check_python-markdown() {
-  [[ $(python -c "import markdown; print(markdown._get_version())") == "$pkgver" ]]
+  [[ $(python -c "import markdown; print(markdown.version)") == "$pkgver" ]]
   [[ $(python -c "import markdown; print(markdown.markdown('*test*'))") == "<p><em>test</em></p>" ]]
 }
 
 check_python2-markdown() {
-  [[ $(python2 -c "import markdown; print(markdown._get_version())") == "$pkgver" ]]
+  [[ $(python2 -c "import markdown; print(markdown.version)") == "$pkgver" ]]
   [[ $(python2 -c "import markdown; print(markdown.markdown('*test*'))") == "<p><em>test</em></p>" ]]
 }