Notification time stamped 2020-12-31 23:47:37 UTC
From 74ddac7103ec7542c566e0893cae1e79a141bd82 Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra(a)ionic.at>
Date: Dec 31 2020 23:47:27 +0000
Subject: update dependency feedparser to v6
---
diff --git a/rss2email-feedparser-6-support.patch b/rss2email-feedparser-6-support.patch
new file mode 100644
index 0000000..16b9c13
--- /dev/null
+++ b/rss2email-feedparser-6-support.patch
@@ -0,0 +1,119 @@
+--- a/rss2email/feed.py
++++ b/rss2email/feed.py
+@@ -433,7 +433,7 @@ def _check_for_errors(self, parsed):
+ elif isinstance(exc, _SOCKET_ERRORS):
+ _LOG.error('{}: {}'.format(exc, self))
+ warned = True
+- elif isinstance(exc, _feedparser.zlib.error):
++ elif isinstance(exc, _feedparser.http.zlib.error):
+ _LOG.error('broken compression: {}'.format(self))
+ warned = True
+ elif isinstance(exc, (IOError, AttributeError)):
+
+
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,2 +1,2 @@
+-feedparser==5.2.1
++feedparser>=6.0.0
+ html2text==2020.1.16
+
+--- a/setup.py
++++ b/setup.py
+@@ -65,7 +65,7 @@
+ scripts=['r2e'],
+ provides=['rss2email'],
+ install_requires=[
+- 'feedparser>=5.0.1',
++ 'feedparser>=6.0.0',
+ 'html2text>=3.0.1',
+ ],
+ )
+
+
+--- a/.github/workflows/python-package.yml
++++ b/.github/workflows/python-package.yml
+@@ -15,7 +15,7 @@ jobs:
+ strategy:
+ matrix:
+ os: [ubuntu-latest]
+- python-version: [3.5, 3.6, 3.7, 3.8]
++ python-version: [3.6, 3.7, 3.8]
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python ${{ matrix.python-version }}
+
+
+--- a/HACKING.md
++++ b/HACKING.md
+@@ -43,9 +43,9 @@ against multiple python versions.
+ You can build each one of them like this:
+
+ ```
+-nix-build -A pythonVersions.rss2email-python_3_5 nix/release.nix
+ nix-build -A pythonVersions.rss2email-python_3_6 nix/release.nix
+ nix-build -A pythonVersions.rss2email-python_3_7 nix/release.nix
++nix-build -A pythonVersions.rss2email-python_3_8 nix/release.nix
+ …
+ ```
+
+
+--- a/nix/release.nix
++++ b/nix/release.nix
+@@ -3,7 +3,6 @@ let
+ pkgs = import nixpkgs {};
+
+ supportedPackageSets = [
+- { version = "3_5"; set = pkgs.python35Packages; }
+ { version = "3_6"; set = pkgs.python36Packages; }
+ { version = "3_7"; set = pkgs.python37Packages; }
+ { version = "3_8"; set = pkgs.python38Packages; }
+@@ -31,7 +30,7 @@ let
+ '';
+ };
+
+- # { "rss2email-python_3_5" = <rss2email package>; … }
++ # { "rss2email-python_3_6" = <rss2email package>; … }
+ rss2emailVersions =
+ (pkgs.lib.listToAttrs
+ (map
+
+
+--- a/rss2email/email.py
++++ b/rss2email/email.py
+@@ -325,7 +325,7 @@ def _flatten(message):
+ """
+ bytesio = _io.BytesIO()
+ # TODO: use policies argument instead of policy set in `message`
+- # see
https://docs.python.org/3.5/library/email.generator.html?highlight=bytesg...
++ # see
https://docs.python.org/3.6/library/email.generator.html?highlight=bytesg...
+ generator = _BytesGenerator(bytesio)
+ try:
+ generator.flatten(message)
+
+
+--- a/setup.py
++++ b/setup.py
+@@ -54,7 +54,6 @@
+ 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3',
+- 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+
+
+--- a/test/data/disqus/1.expected
++++ b/test/data/disqus/1.expected
+@@ -43,7 +43,7 @@
+ List-ID: <test.localhost>
+ List-Post: NO (posting not allowed on this list)
+ X-RSS-Feed: data/disqus/feed.rss
+-X-RSS-ID: ab03f2100069a1cd0876b997be87976c18d48e8a
++X-RSS-ID: a52375ec78a988241fe9864a2243d4d910538d52
+ X-RSS-URL:
http://software-carpentry.org/2012/11/who-wants-to-write-a-little-code/#c...
+
+ @Hans-Martin
+
+
diff --git a/rss2email.spec b/rss2email.spec
index da4798f..1b9082d 100644
--- a/rss2email.spec
+++ b/rss2email.spec
@@ -1,6 +1,6 @@
Name: rss2email
Version: 3.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Deliver news from RSS feeds to your SMTP server as text or HTML mail
License: GPLv2+ or GPLv3+
@@ -10,11 +10,12 @@ Source0: %{url}/archive/v%{version}.tar.gz
Source1: r2e-migrate
Source2: r2e-migrate.1
Source3: README.migrate
+Patch0: rss2email-feedparser-6-support.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
-BuildRequires: python3-feedparser >= 5.2.1
+BuildRequires: python3-feedparser >= 6.0.0
BuildRequires: python3-html2text >= 2018.1.9
Recommends: python3-beautifulsoup4
Recommends: esmtp
@@ -77,6 +78,9 @@ PATH="${PATH}:%{buildroot}%{_bindir}"
PYTHONPATH=%{buildroot}%{python3_sitelib}
%{_datadir}/zsh/functions/Completion/Unix/_r2e
%changelog
+* Thu Dec 31 2020 David Kaufmann <astra(a)ionic.at> - 3.12.2-2
+- Update to feedparser 6
+
* Tue Sep 01 2020 David Kaufmann <astra(a)ionic.at> - 3.12.2-1
- Update to 3.12.2
- Reference files by tag instead of commit
https://src.fedoraproject.org/rpms/rss2email/c/74ddac7103ec7542c566e0893c...