Accepting request 834371 from home:benoit_monin:branches:devel:languages:python

- update to version 6.0.0 - build the package only for python3 - drop py37.patch: fixed upstream - drop non-ascii-entity-hiding.patch: fixed upstream - drop catch-gzip-error.patch: fixed upstream - fix build requires for chardet and sgmllib3k - remove chmod on all source files: fixed upstream - drop moving around source files: reworked upstream - run the tests as described by upstream - fix the list of packaged files OBS-URL: https://build.opensuse.org/request/show/834371 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-feedparser?expand=0&rev=42
2020-09-15 06:56:24 +00:00
parent 1996bea540
commit 39f80854ee
7 changed files with 53 additions and 101 deletions
--- a/catch-gzip-error.patch
+++ b/catch-gzip-error.patch
@@ -1,30 +0,0 @@
-diff -ur feedparser-5.2.1-orig/feedparser/feedparser.py feedparser-5.2.1/feedparser/feedparser.py
--- feedparser-5.2.1-orig/feedparser/feedparser.py	2015-07-24 12:00:04.000000000 +0700
-+++ feedparser-5.2.1/feedparser/feedparser.py	2019-03-31 02:26:41.242238792 +0700
-@@ -3865,12 +3869,12 @@
-         if gzip and 'gzip' in http_headers.get('content-encoding', ''):
-             try:
-                 data = gzip.GzipFile(fileobj=_StringIO(data)).read()
-            except (IOError, struct.error), e:
-+            except (EOFError, IOError, struct.error), e:
-                 # IOError can occur if the gzip header is bad.
-                 # struct.error can occur if the data is damaged.
-                 result['bozo'] = 1
-                 result['bozo_exception'] = e
-                if isinstance(e, struct.error):
-+                if isinstance(e, (EOFError, struct.error)):
-                     # A gzip header was found but the data is corrupt.
-                     # Ideally, we should re-request the feed without the
-                     # 'Accept-encoding: gzip' header, but we don't.
-diff -ur feedparser-5.2.1-orig/feedparser/feedparsertest.py feedparser-5.2.1/feedparser/feedparsertest.py
--- feedparser-5.2.1-orig/feedparser/feedparsertest.py	2015-07-24 11:45:09.000000000 +0700
-+++ feedparser-5.2.1/feedparser/feedparsertest.py	2019-03-31 04:02:14.470216076 +0700
-@@ -448,7 +456,7 @@
-     def test_gzip_struct_error(self):
-         f = feedparser.parse('http://localhost:8097/tests/compression/gzip-struct-error.gz')
-         self.assertEqual(f.bozo, 1)
-        self.assertTrue(isinstance(f.bozo_exception, struct.error))
-+        self.assertTrue(isinstance(f.bozo_exception, (EOFError, struct.error)))
-     def test_zlib_good(self):
-         f = feedparser.parse('http://localhost:8097/tests/compression/deflate.z')
-         self.assertEqual(f.version, 'atom10')
--- a/feedparser-5.2.1.tar.bz2
+++ b/feedparser-5.2.1.tar.bz2
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce875495c90ebd74b179855449040003a1beb40cd13d5f037a0654251e260b02
-size 192328
--- a/feedparser-6.0.0.tar.gz
+++ b/feedparser-6.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a13fb1f26a7da985b51e6d1e91102fb1b1e5eb5d550a192643049a527bb24b0d
+size 285322
--- a/non-ascii-entity-hiding.patch
+++ b/non-ascii-entity-hiding.patch
@@ -1,17 +0,0 @@
-diff -ur feedparser-5.2.1-orig/feedparser/feedparsertest.py feedparser-5.2.1/feedparser/feedparsertest.py
--- feedparser-5.2.1-orig/feedparser/feedparsertest.py	2015-07-24 11:45:09.000000000 +0700
-+++ feedparser-5.2.1/feedparser/feedparsertest.py	2019-03-31 04:02:14.470216076 +0700
-@@ -273,6 +273,13 @@
-         <feed><title type="html">&exponential3;</title></feed>"""
-         doc = codecs.BOM_UTF16_BE + doc.encode('utf-16be')
-         result = feedparser.parse(doc)
-+        if sys.version_info >= (3, 5):
-+            # While this isnt the expected result, it is verification that
-+            # non-ASCII-compatible encodings cant hide nasty stuff.
-+            # Instead, nothing is loaded, which is a bug in a different
-+            # area.
-+            self.assertEqual(result['feed'], {})
-+            return
-         self.assertEqual(result['feed']['title'], u'&amp;exponential3')
-     def test_gb2312_converted_to_gb18030_in_xml_encoding(self):
-         # \u55de was chosen because it exists in gb18030 but not gb2312
--- a/py37.patch
+++ b/py37.patch
@@ -1,16 +0,0 @@
-diff -ur feedparser-5.2.1-orig/feedparser/feedparser.py feedparser-5.2.1/feedparser/feedparser.py
--- feedparser-5.2.1-orig/feedparser/feedparser.py	2015-07-24 12:00:04.000000000 +0700
-+++ feedparser-5.2.1/feedparser/feedparser.py	2019-03-31 02:26:41.242238792 +0700
-@@ -3764,7 +3764,11 @@
-     latlons = itertools.imap(float, value.strip().replace(',', ' ').split())
-     nxt = latlons.next
-     while True:
-        t = [nxt(), nxt()][::swap and -1 or 1]
-+        # Python 3.7 support
-+        try:
-+            t = [nxt(), nxt()][::swap and -1 or 1]
-+        except StopIteration:
-+            return
-         if dims == 3:
-             t.append(nxt())
-         yield tuple(t)
--- a/python-feedparser.changes
+++ b/python-feedparser.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Mon Sep 14 20:10:18 UTC 2020 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to version 6.0.0:
+  * Support Python 3.6, 3.7, 3.8 and 3.9
+  * Drop support for Python 2.4 through 2.7, and Python 3.0 through
+    3.5 (#169)
+  * Convert feedparser from a monolithic file to a package
+  * feedparser.parse(sanitize_html=bool) argument replaces the
+    feedparser.SANITIZE_HTML global
+  * feedparser.parse(resolve_relative_uris=bool) replaces the
+    feedparser.RESOLVE_RELATIVE_URIS global
+  * Unify the codebase so that 2to3 conversion is no longer
+    required
+  * Remove references to iconv_codecs
+  * Update the Creative Commons namespace URI's
+  * Update the default User-Agent name and URL
+  * Support Middle European (Summer) Time timezones (#20)
+  * Pass data to lazy_chardet_encoding() (#50)
+  * Document that datetimes are returned in UTC (#51)
+  * Remove cjkpython references in the documentation (#57)
+  * Resolve ResourceWarnings thrown during unit tests (#170)
+  * Fix tox build failures (#213)
+  * Use base64.decodebytes() directly to support Python 3.9 (#201)
+  * Fix Python 3.8 urllib.parse.splittype() deprecation warning
+    (#211)
+  * Support parsing colons in RFC822 timezones (#144)
+  * Add `chardet` as an optional tox environment dependency
+  * Fix the Big5 unit test that fails when chardet is installed
+    (#184)
+- build the package only for python3
+- drop py37.patch: fixed upstream
+- drop non-ascii-entity-hiding.patch: fixed upstream
+- drop catch-gzip-error.patch: fixed upstream
+- fix build requires for chardet and sgmllib3k
+- remove chmod on all source files: fixed upstream
+- drop moving around source files: reworked upstream
+- run the tests as described by upstream
+- fix the list of packaged files
+
 -------------------------------------------------------------------
 Sat Mar 30 22:06:01 UTC 2019 - John Vandenberg <jayvdb@gmail.com>

--- a/python-feedparser.spec
+++ b/python-feedparser.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-feedparser
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,35 +16,25 @@
 #


+%define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-feedparser
-Version:        5.2.1
+Version:        6.0.0
 Release:        0
 Summary:        Universal Feed Parser Module for Python
 License:        BSD-2-Clause
 Group:          Development/Libraries/Python
 URL:            https://github.com/kurtmckee/feedparser
-Source:         https://files.pythonhosted.org/packages/source/f/feedparser/feedparser-%{version}.tar.bz2
-Patch0:         py37.patch
-Patch1:         non-ascii-entity-hiding.patch
-# Similar to https://github.com/kurtmckee/feedparser/commit/b3d9463.patch
-# However the "gets overwritten as xml.sax.SAXException later" is not
-# happening in version 5.2.1.
-Patch2:         catch-gzip-error.patch
+Source:         https://files.pythonhosted.org/packages/source/f/feedparser/feedparser-%{version}.tar.gz
+BuildRequires:  %{python_module chardet}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module sgmllib3k}
 BuildRequires:  %{python_module xml}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-sgmllib3k
-# Tests fail in Python 2 and 3 when chardet is installed
-#BuildRequires:  python3-chardet
 Requires:       python-xml
-# chardet is an optional dependency, but some tests fail when it is present
 Recommends:     python-chardet
-%ifpython3
-# If sgmllib is not available, the parser can fail with undefined local variable
-Requires:       python3-sgmllib3k
-%endif
+Requires:       python-sgmllib3k
 BuildArch:      noarch
 %python_subpackages

@@ -54,17 +44,6 @@ A universal feed parser module for Python that handles RSS 0.9x, RSS 1.0, RSS

 %prep
 %setup -q -n feedparser-%{version}
-%autopatch -p1
-
-find . -type f -exec chmod 0644 {} \;  # 5.2.1 had executable bit set on almost all files
-
-# In version 5.2.1, it contains only test data, so move it out of install
-mv feedparser/tests .
-
-# Move the test module out of the runtime install, into top level directory
-# so it can find the test data, and manually run 2to3.
-python3 -m lib2to3 -w -n -o . --add-suffix=-%{python3_bin_suffix} --no-diffs feedparser/feedparsertest.py
-mv feedparser/feedparsertest.py feedparsertest.py-%{python2_bin_suffix}

 %build
 %python_build
@@ -75,17 +54,13 @@ mv feedparser/feedparsertest.py feedparsertest.py-%{python2_bin_suffix}

 %check
 %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}:${PWD}
-cp feedparsertest.py-%{$python_bin_suffix} feedparsertest.py
-$python -c 'import feedparser; assert feedparser._XML_AVAILABLE == 1; assert feedparser._SGML_AVAILABLE == 1'
-$python -c 'import feedparsertest; assert feedparsertest._UTF32_AVAILABLE == 1'
-$python feedparsertest.py
+$python tests/runtests.py
 }

 %files %{python_files}
 %license LICENSE
 %doc NEWS README.rst
-%{python_sitelib}/feedparser.py*
-%pycache_only %{python_sitelib}/__pycache__/feedparser.*.py*
-%{python_sitelib}/feedparser-%{version}-py*.egg-info
+%{python_sitelib}/feedparser/
+%{python_sitelib}/feedparser-%{version}-py%{python_version}.egg-info

 %changelog