[arch-commits] Commit in python-feedparser/repos/staging-any (3 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Nov 12 05:47:17 UTC 2020
Date: Thursday, November 12, 2020 @ 05:47:16
Author: foutrelis
Revision: 400435
archrelease: copy trunk to staging-any
Added:
python-feedparser/repos/staging-any/PKGBUILD
(from rev 400434, python-feedparser/trunk/PKGBUILD)
python-feedparser/repos/staging-any/don-t-always-expect-base64.decodestring-to-exist.patch
(from rev 400434, python-feedparser/trunk/don-t-always-expect-base64.decodestring-to-exist.patch)
Deleted:
python-feedparser/repos/staging-any/PKGBUILD
--------------------------------------------------------+
PKGBUILD | 116 +++++++--------
don-t-always-expect-base64.decodestring-to-exist.patch | 35 ++++
2 files changed, 95 insertions(+), 56 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-12 05:47:05 UTC (rev 400434)
+++ PKGBUILD 2020-11-12 05:47:16 UTC (rev 400435)
@@ -1,56 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=python-feedparser
-pkgname=('python2-feedparser' 'python-feedparser' 'python-sgmllib')
-pkgver=5.2.1
-pkgrel=8
-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')
-
-prepare() {
- cp -r feedparser-${pkgver} feedparser-${pkgver}-python2
- cp -r feedparser-${pkgver} feedparser-${pkgver}-python
- cp -r feedparser-${pkgver} feedparser-${pkgver}-sgmllib
-
- (cd feedparser-${pkgver}-python2; sed -i 's#env python$#env python2#' feedparser/feedparsertest.py)
- (cd feedparser-${pkgver}-python; 2to3 -w feedparser/feedparser.py feedparser/feedparsertest.py)
-}
-
-build() {
- cd feedparser-${pkgver}-sgmllib
- python /usr/lib/python3.9/compileall.py feedparser/sgmllib3.py
-}
-
-package_python2-feedparser() {
- depends=('python2' 'libxml2' )
- pkgdesc="Parse RSS and Atom feeds in Python2"
-
- cd "${srcdir}/feedparser-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/license"
-}
-
-package_python-feedparser() {
- depends=('libxml2' 'python-sgmllib')
-
- cd "${srcdir}/feedparser-${pkgver}-python"
- python setup.py install --root="${pkgdir}"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/license"
-}
-
-package_python-sgmllib() {
- depends=('python')
- pkgdesc="Port of sgmllib to Python3"
- license=('PSF')
-
- cd "${srcdir}/feedparser-${pkgver}-sgmllib"
- install -Dm644 feedparser/sgmllib3.py \
- "${pkgdir}/usr/lib/python3.9/site-packages/sgmllib.py"
- install -Dm644 feedparser/__pycache__/sgmllib3.cpython-39.pyc \
- "${pkgdir}/usr/lib/python3.9/site-packages/__pycache__/sgmllib.cpython-39.pyc"
-}
Copied: python-feedparser/repos/staging-any/PKGBUILD (from rev 400434, python-feedparser/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-12 05:47:16 UTC (rev 400435)
@@ -0,0 +1,60 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=python-feedparser
+pkgname=('python2-feedparser' 'python-feedparser' 'python-sgmllib')
+pkgver=5.2.1
+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
+ 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
+
+ (cd feedparser-${pkgver}-python2; sed -i 's#env python$#env python2#' feedparser/feedparsertest.py)
+ (cd feedparser-${pkgver}-python; 2to3 -w feedparser/feedparser.py feedparser/feedparsertest.py)
+}
+
+build() {
+ cd feedparser-${pkgver}-sgmllib
+ python /usr/lib/python3.9/compileall.py feedparser/sgmllib3.py
+}
+
+package_python2-feedparser() {
+ depends=('python2' 'libxml2' )
+ pkgdesc="Parse RSS and Atom feeds in Python2"
+
+ cd "${srcdir}/feedparser-${pkgver}-python2"
+ python2 setup.py install --root="${pkgdir}"
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/license"
+}
+
+package_python-feedparser() {
+ depends=('libxml2' 'python-sgmllib')
+
+ cd "${srcdir}/feedparser-${pkgver}-python"
+ python setup.py install --root="${pkgdir}"
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/license"
+}
+
+package_python-sgmllib() {
+ depends=('python')
+ pkgdesc="Port of sgmllib to Python3"
+ license=('PSF')
+
+ cd "${srcdir}/feedparser-${pkgver}-sgmllib"
+ install -Dm644 feedparser/sgmllib3.py \
+ "${pkgdir}/usr/lib/python3.9/site-packages/sgmllib.py"
+ install -Dm644 feedparser/__pycache__/sgmllib3.cpython-39.pyc \
+ "${pkgdir}/usr/lib/python3.9/site-packages/__pycache__/sgmllib.cpython-39.pyc"
+}
Copied: python-feedparser/repos/staging-any/don-t-always-expect-base64.decodestring-to-exist.patch (from rev 400434, python-feedparser/trunk/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:16 UTC (rev 400435)
@@ -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
+
More information about the arch-commits
mailing list