Page MenuHomeSolus
Files F10857044

D11716.diff
No OneTemporary
Actions

D11716.diff
View Options

diff --git a/files/don-t-always-expect-base64.decodestring-to-exist.patch b/files/don-t-always-expect-base64.decodestring-to-exist.patch
new file mode 100644
--- /dev/null
+++ b/files/don-t-always-expect-base64.decodestring-to-exist.patch
@@ -0,0 +1,34 @@
+From 696d957e13d1bc5b2034dcd637bc088cc4646a53 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@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@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
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : python-feedparser
version : 5.2.1
-release : 7
+release : 8
source :
- https://pypi.python.org/packages/source/f/feedparser/feedparser-5.2.1.tar.gz : bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9
license :
@@ -11,6 +11,8 @@
description: |
Universal feed parser, handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds.
setup : |
+ %patch -p1 <$pkgfiles/don-t-always-expect-base64.decodestring-to-exist.patch
+build : |
%python3_setup
install : |
%python3_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>python-feedparser</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Algent Albrahimi</Name>
+ <Email>algent@protonmail.com</Email>
</Packager>
<License>BSD-2-Clause</License>
<License>MIT</License>
@@ -29,12 +29,12 @@
</Files>
</Package>
<History>
- <Update release="7">
- <Date>2021-07-28</Date>
+ <Update release="8">
+ <Date>2021-08-21</Date>
<Version>5.2.1</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Algent Albrahimi</Name>
+ <Email>algent@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 16 2023, 3:03 AM (8 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5791250
Default Alt Text
D11716.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.