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

[Evangelos Foutras]

    Date: Thursday, November 12, 2020 @ 05:47:05
  Author: foutrelis
Revision: 400434

Add a fix from Fedora for Python 3.9

Added:
  python-feedparser/trunk/don-t-always-expect-base64.decodestring-to-exist.patch
Modified:
  python-feedparser/trunk/PKGBUILD

--------------------------------------------------------+
 PKGBUILD                                               |   10 +++-
 don-t-always-expect-base64.decodestring-to-exist.patch |   35 +++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-11 22:41:20 UTC (rev 400433)
+++ PKGBUILD	2020-11-12 05:47:05 UTC (rev 400434)
@@ -3,16 +3,20 @@
 pkgbase=python-feedparser
 pkgname=('python2-feedparser' 'python-feedparser' 'python-sgmllib')
 pkgver=5.2.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Parse RSS and Atom feeds in Python"
 arch=('any')
 url="https://github.com/kurtmckee/feedparser/"
 license=('custom')
 makedepends=('python' 'python2' 'libxml2' 'python2-setuptools' 'python-setuptools')
-source=(feedparser-${pkgver}.tar.gz::https://github.com/kurtmckee/feedparser/archive/${pkgver}.tar.gz)
-sha1sums=('13c9a17f821e46ba9a34d8777e0ae47a6eb86de4')
+source=(feedparser-${pkgver}.tar.gz::https://github.com/kurtmckee/feedparser/archive/${pkgver}.tar.gz
+        don-t-always-expect-base64.decodestring-to-exist.patch)
+sha1sums=('13c9a17f821e46ba9a34d8777e0ae47a6eb86de4'
+          '24542c47555fb1b07855e00d2fdf732582f397ae')
 
 prepare() {
+  patch -Np1 -d feedparser-${pkgver} <don-t-always-expect-base64.decodestring-to-exist.patch
+
   cp -r feedparser-${pkgver} feedparser-${pkgver}-python2
   cp -r feedparser-${pkgver} feedparser-${pkgver}-python
   cp -r feedparser-${pkgver} feedparser-${pkgver}-sgmllib

Added: don-t-always-expect-base64.decodestring-to-exist.patch
===================================================================
--- don-t-always-expect-base64.decodestring-to-exist.patch	                        (rev 0)
+++ don-t-always-expect-base64.decodestring-to-exist.patch	2020-11-12 05:47:05 UTC (rev 400434)
@@ -0,0 +1,35 @@
+From 696d957e13d1bc5b2034dcd637bc088cc4646a53 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Fri, 15 May 2020 09:15:20 -0700
+Subject: [PATCH] Don't always expect base64.decodestring to exist
+
+This does the same as before, but in such a way as not to fail if
+`base64.decodestring` doesn't exist at all - as is the case in
+Python 3.9.
+
+This is a backport of #206 on top of 5.2.1.
+
+Signed-off-by: Adam Williamson <awilliam at redhat.com>
+---
+ feedparser/feedparser.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
+index 999cb0d..1548db8 100644
+--- a/feedparser/feedparser.py
++++ b/feedparser/feedparser.py
+@@ -90,7 +90,10 @@ except ImportError:
+     base64 = binascii = None
+ else:
+     # Python 3.1 deprecates decodestring in favor of decodebytes
+-    _base64decode = getattr(base64, 'decodebytes', base64.decodestring)
++    try:
++        _base64decode = base64.decodebytes
++    except AttributeError:
++        _base64decode = base64.decodestring
+ 
+ # _s2bytes: convert a UTF-8 str to bytes if the interpreter is Python 3
+ # _l2bytes: convert a list of ints to bytes if the interpreter is Python 3
+-- 
+2.26.2
+