[arch-commits] Commit in python-typogrify/repos/community-any (3 files)

[Evangelos Foutras]

    Date: Tuesday, May 24, 2022 @ 12:58:52
  Author: foutrelis
Revision: 1210204

archrelease: copy trunk to community-any

Added:
  python-typogrify/repos/community-any/PKGBUILD
    (from rev 1210203, python-typogrify/trunk/PKGBUILD)
  python-typogrify/repos/community-any/jinja-3.1.patch
    (from rev 1210203, python-typogrify/trunk/jinja-3.1.patch)
Deleted:
  python-typogrify/repos/community-any/PKGBUILD

-----------------+
 PKGBUILD        |   51 +++++++++++++++++++++++++++++----------------------
 jinja-3.1.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 22 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-24 12:58:48 UTC (rev 1210203)
+++ PKGBUILD	2022-05-24 12:58:52 UTC (rev 1210204)
@@ -1,22 +0,0 @@
-# Maintainer: Jiachen Yang <farseerfc at gmail.com>
-# AUR Maintainer: Chris Warrick <aur at chriswarrick.com>
-
-pkgname=python-typogrify
-_pyname=typogrify
-pkgver=2.0.7
-pkgrel=12
-pkgdesc='filters to make caring about typography on the web a bit easier'
-arch=('any')
-url='https://github.com/mintchaos/typogrify'
-license=('BSD')
-depends=('python' 'python-smartypants')
-makedepends=('python-setuptools')
-source=("https://pypi.python.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('63f38f80531996f187d2894cc497ba08')
-
-package() {
-  cd "${srcdir}/${_pyname}-${pkgver}"
-  python3 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-}
-# vim:set ts=2 sw=2 et:

Copied: python-typogrify/repos/community-any/PKGBUILD (from rev 1210203, python-typogrify/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-24 12:58:52 UTC (rev 1210204)
@@ -0,0 +1,29 @@
+# Maintainer: Jiachen Yang <farseerfc at gmail.com>
+# AUR Maintainer: Chris Warrick <aur at chriswarrick.com>
+
+pkgname=python-typogrify
+_pyname=typogrify
+pkgver=2.0.7
+pkgrel=13
+pkgdesc='filters to make caring about typography on the web a bit easier'
+arch=('any')
+url='https://github.com/mintchaos/typogrify'
+license=('BSD')
+depends=('python' 'python-smartypants')
+makedepends=('python-setuptools')
+source=("https://pypi.python.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
+        jinja-3.1.patch)
+md5sums=('63f38f80531996f187d2894cc497ba08'
+         '127f2e8c99733cc24dbe785dd23c34bd')
+
+prepare() {
+  cd "${srcdir}/${_pyname}-${pkgver}"
+  patch -Np1 -i ../jinja-3.1.patch
+}
+
+package() {
+  cd "${srcdir}/${_pyname}-${pkgver}"
+  python3 setup.py install --root="${pkgdir}/" --optimize=1
+  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+}
+# vim:set ts=2 sw=2 et:

Copied: python-typogrify/repos/community-any/jinja-3.1.patch (from rev 1210203, python-typogrify/trunk/jinja-3.1.patch)
===================================================================
--- jinja-3.1.patch	                        (rev 0)
+++ jinja-3.1.patch	2022-05-24 12:58:52 UTC (rev 1210204)
@@ -0,0 +1,45 @@
+From 34b6e01b71afd6876bbd2ef7ad134d11d05c82a0 Mon Sep 17 00:00:00 2001
+From: Jordan Yelloz <jordan at yelloz.me>
+Date: Sat, 2 Apr 2022 11:29:31 -0600
+Subject: [PATCH] jinja_filters: Updated import for Jinja 3.1.
+
+Added some fallback imports just to reduce the possibility of breakage with
+users running the latest version of typogrify and older versions of Flask/Jinja
+for whatever reason.
+
+Jinja 3.1.x has removed the jinja2.Markup function which was deprecated in Jinja
+3.0.x.
+
+See:
+- https://jinja.palletsprojects.com/en/3.1.x/changes/#version-3-1-0
+- https://github.com/pallets/jinja/pull/1544
+
+(cherry picked from commit 279c6b6c9f3a8b1bd065960a0e0bbe73236d717f)
+---
+ typogrify/templatetags/jinja_filters.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/typogrify/templatetags/jinja_filters.py b/typogrify/templatetags/jinja_filters.py
+index 0596c0b..d6e9b9e 100644
+--- a/typogrify/templatetags/jinja_filters.py
++++ b/typogrify/templatetags/jinja_filters.py
+@@ -1,6 +1,9 @@
+ from typogrify.filters import amp, caps, initial_quotes, smartypants, titlecase, typogrify, widont, TypogrifyError
+ from functools import wraps
+-import jinja2
++try:
++    from markupsafe import Markup
++except ImportError:
++    from jinja2 import Markup
+ from jinja2.exceptions import TemplateError
+ 
+ 
+@@ -18,7 +21,7 @@ def make_safe(f):
+             out = f(text)
+         except TypogrifyError as e:
+             raise TemplateError(e.message)
+-        return jinja2.Markup(out)
++        return Markup(out)
+     wrapper.is_safe = True
+     return wrapper
+