diff --git a/gnu/local.mk b/gnu/local.mk index 3fb1af63869..70f2d933d3a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2072,7 +2072,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-clarabel-blas.patch \ %D%/packages/patches/python-docrepr-fix-tests.patch \ - %D%/packages/patches/python-feedparser-missing-import.patch \ %D%/packages/patches/python-gpg-setup-72.patch \ %D%/packages/patches/python-hdmedians-replace-nose.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ diff --git a/gnu/packages/patches/python-feedparser-missing-import.patch b/gnu/packages/patches/python-feedparser-missing-import.patch deleted file mode 100644 index 6ed504c1d25..00000000000 --- a/gnu/packages/patches/python-feedparser-missing-import.patch +++ /dev/null @@ -1,34 +0,0 @@ -Since feedparser messes with Python’s internals by assigning -to __code__ it needs to import SGMLParseError too. It also -expects SGMLParseError, which was turned into AssertionError by -https://github.com/python/cpython/commit/e34bbfd61f405eef89e8aa50672b0b25022de320 - ---- feedparser-6.0.10/feedparser/sgml.py.orig 2023-03-18 09:24:50.976316932 +0100 -+++ feedparser-6.0.10/feedparser/sgml.py 2023-03-18 09:26:32.971928811 +0100 -@@ -28,6 +28,7 @@ - import re - - import sgmllib -+from sgmllib import SGMLParseError - - __all__ = [ - 'sgmllib', -@@ -41,6 +42,7 @@ - 'shorttagopen', - 'starttagopen', - 'endbracket', -+ 'SGMLParseError', - ] - - # sgmllib defines a number of module-level regular expressions that are ---- feedparser-6.0.10/feedparser/html.py.orig 2023-03-18 09:32:03.647114745 +0100 -+++ feedparser-6.0.10/feedparser/html.py 2023-03-18 09:46:05.021142671 +0100 -@@ -349,7 +349,7 @@ - - try: - return sgmllib.SGMLParser.parse_declaration(self, i) -- except sgmllib.SGMLParseError: -+ except AssertionError: - # Escape the doctype declaration and continue parsing. - self.handle_data('<') - return i+1 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0f5c239073f..5bd549309c4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5558,20 +5558,19 @@ Integration Center (4DN-DCIC).") (define-public python-feedparser (package (name "python-feedparser") - (version "6.0.11") + (version "6.0.12") (source (origin (method url-fetch) (uri (pypi-uri "feedparser" version ".tar.gz")) (sha256 - (base32 "1mc4856draxac5s7acywq060a0awng195cpbs1js1wn6cixl1l69")) - (patches (search-patches "python-feedparser-missing-import.patch")))) + (base32 "0a22z6jx9lhw5glfb2nxf77bq9nfa0xqs3yy3rfyzs731blnrxv4")))) (build-system pyproject-build-system) (arguments (list #:test-backend #~'custom #:test-flags #~(list "tests/runtests.py"))) - (native-inputs (list python-setuptools)) + (native-inputs (list python-setuptools python-wheel)) (propagated-inputs (list python-sgmllib3k)) (home-page "https://github.com/kurtmckee/feedparser") (synopsis "Parse feeds in Python")