Merge pull request #417 from kurtmckee/hotfix-6.0.11

Hotfix 6.0.11
kurtmckee · Dec 10, 2023 · 6cdc208 · 6cdc208
2 parents 32adbe1 + 7da33c6
commit 6cdc208
Show file tree

Hide file tree

Showing 40 changed files with 86 additions and 51 deletions.
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ feedparser and its unit tests are released under the following license:
 
 ----- begin license block -----
 
-Copyright (C) 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+Copyright (C) 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 Copyright (C) 2002-2008 Mark Pilgrim
 All rights reserved.
 
@@ -38,7 +38,7 @@ released under the following license:
 
 ----- begin license block -----
 
-Copyright (C) 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+Copyright (C) 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 Copyright (C) 2004-2008 Mark Pilgrim. All rights reserved.
 
 Redistribution and use in source (Sphinx ReST) and "compiled" forms (HTML, PDF,

diff --git a/NEWS b/NEWS
@@ -1,5 +1,8 @@
 coming in the next release:
 
+6.0.11 - 9 December 2023
+    *   Resolve ``cgi`` module deprecation warnings. (#330)
+
 6.0.10 - 21 May 2022
     *   Populate ``<summary>`` correctly if it comes after ``<content>``. (#260)
 

diff --git a/README.rst b/README.rst
@@ -1,17 +1,24 @@
-feedparser - Parse Atom and RSS feeds in Python.
+..
+    This file is part of feedparser.
+    Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
+    Copyright 2002-2008 Mark Pilgrim
+    Released under the BSD 2-clause license.
 
-| Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
-| Copyright 2002-2008 Mark Pilgrim
 
-feedparser is open source. See the LICENSE file for more information.
+feedparser
+##########
+
+Parse Atom and RSS feeds in Python.
+
+----
 
 
 Installation
 ============
 
 feedparser can be installed by running pip:
 
-..  code-block:: shell
+..  code-block:: console
 
     $ pip install feedparser
 
@@ -30,7 +37,7 @@ To build the documentation you'll need the Sphinx package, which is available at
 
 You can then build HTML pages using a command similar to:
 
-..  code-block:: shell
+..  code-block:: console
 
     $ sphinx-build -b html docs/ fpdocs
 
@@ -42,7 +49,7 @@ Testing
 
 Feedparser has an extensive test suite, powered by tox. To run it, type this:
 
-..  code-block:: shell
+..  code-block:: console
 
     $ python -m venv venv
     $ source venv/bin/activate  # or "venv\bin\activate.ps1" on Windows

diff --git a/changelog.d/20220521_105155_kurtmckee_fix_python_3_11_cgi_deprecation.rst b/changelog.d/20220521_105155_kurtmckee_fix_python_3_11_cgi_deprecation.rst
@@ -0,0 +1,4 @@
+Fixed
+-----
+
+*   Replace a call to ``cgi.parse_header()``, which causes deprecation warnings in Python 3.11.
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,7 +11,7 @@
 
 # project information
 project = 'feedparser'
-copyright = '2010-2022 Kurt McKee, 2004-2008 Mark Pilgrim'
+copyright = '2010-2023 Kurt McKee, 2004-2008 Mark Pilgrim'
 language = 'en'
 
 # documentation options

diff --git a/docs/license.rst b/docs/license.rst
@@ -3,7 +3,7 @@
 Documentation license
 =====================
 
-Copyright 2010-2022 Kurt McKee, 2004-2008 Mark Pilgrim. All rights reserved.
+Copyright 2010-2023 Kurt McKee, 2004-2008 Mark Pilgrim. All rights reserved.
 
 Redistribution and use in source (Sphinx ReST) and "compiled" forms (HTML, PDF,
 PostScript, RTF and so forth) with or without modification, are permitted

diff --git a/dodo.py b/dodo.py
@@ -1,5 +1,5 @@
 # This file is part of feedparser.
-# Copyright 2020-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2020-2023 Kurt McKee <contactme@kurtmckee.org>
 # Released under the BSD 2-clause license.
 
 # The tasks defined in this file automates the entire

diff --git a/feedparser/__init__.py b/feedparser/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -32,7 +32,7 @@
 
 __author__ = 'Kurt McKee <contactme@kurtmckee.org>'
 __license__ = 'BSD 2-clause'
-__version__ = '6.0.10'
+__version__ = '6.0.11'
 
 # HTTP "User-Agent" header to send to servers when downloading feeds.
 # If you are embedding feedparser in a larger application, you should

diff --git a/feedparser/api.py b/feedparser/api.py
@@ -1,5 +1,5 @@
 # The public API for feedparser
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/__init__.py b/feedparser/datetimes/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/asctime.py b/feedparser/datetimes/asctime.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/greek.py b/feedparser/datetimes/greek.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/hungarian.py b/feedparser/datetimes/hungarian.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/iso8601.py b/feedparser/datetimes/iso8601.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/korean.py b/feedparser/datetimes/korean.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/perforce.py b/feedparser/datetimes/perforce.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/rfc822.py b/feedparser/datetimes/rfc822.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/datetimes/w3dtf.py b/feedparser/datetimes/w3dtf.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/encodings.py b/feedparser/encodings.py
@@ -1,5 +1,5 @@
 # Character encoding routines
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -26,9 +26,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import cgi
 import codecs
 import re
+import typing as t
 
 try:
     try:
@@ -68,6 +68,30 @@ def lazy_chardet_encoding(data):
 RE_XML_PI_ENCODING = re.compile(br'^<\?.*encoding=[\'"](.*?)[\'"].*\?>')
 
 
+def parse_content_type(line: str) -> t.Tuple[str, str]:
+    """Parse an HTTP Content-Type header.
+
+    The return value will be a tuple of strings:
+    the MIME type, and the value of the "charset" (if any).
+
+    This is a custom replacement for Python's cgi.parse_header().
+    The cgi module will be removed in Python 3.13.
+    """
+
+    chunks = line.split(";")
+    if not chunks:
+        return "", ""
+
+    mime_type = chunks[0].strip()
+    charset_value = ""
+    for chunk in chunks[1:]:
+        key, _, value = chunk.partition("=")
+        if key.strip().lower() == "charset":
+            charset_value = value.strip().strip("\"'")
+
+    return mime_type, charset_value
+
+
 def convert_to_utf8(http_headers, data, result):
     """Detect and convert the character encoding to UTF-8.
 
@@ -181,10 +205,7 @@ def convert_to_utf8(http_headers, data, result):
     # XML declaration encoding, and HTTP encoding, following the
     # heuristic defined in RFC 3023.
     http_content_type = http_headers.get('content-type') or ''
-    http_content_type, params = cgi.parse_header(http_content_type)
-    http_encoding = params.get('charset', '').replace("'", "")
-    if isinstance(http_encoding, bytes):
-        http_encoding = http_encoding.decode('utf-8', 'ignore')
+    http_content_type, http_encoding = parse_content_type(http_content_type)
 
     acceptable_content_type = 0
     application_content_types = ('application/xml', 'application/xml-dtd',

diff --git a/feedparser/exceptions.py b/feedparser/exceptions.py
@@ -1,5 +1,5 @@
 # Exceptions used throughout feedparser
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/html.py b/feedparser/html.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/http.py b/feedparser/http.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/mixin.py b/feedparser/mixin.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/_base.py b/feedparser/namespaces/_base.py
@@ -1,5 +1,5 @@
 # Support for the Atom, RSS, RDF, and CDF feed formats
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/admin.py b/feedparser/namespaces/admin.py
@@ -1,5 +1,5 @@
 # Support for the administrative elements extension
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/cc.py b/feedparser/namespaces/cc.py
@@ -1,5 +1,5 @@
 # Support for the Creative Commons licensing extensions
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/dc.py b/feedparser/namespaces/dc.py
@@ -1,5 +1,5 @@
 # Support for the Dublin Core metadata extensions
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/georss.py b/feedparser/namespaces/georss.py
@@ -1,5 +1,5 @@
 # Support for the GeoRSS format
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/itunes.py b/feedparser/namespaces/itunes.py
@@ -1,5 +1,5 @@
 # Support for the iTunes format
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/mediarss.py b/feedparser/namespaces/mediarss.py
@@ -1,5 +1,5 @@
 # Support for the Media RSS format
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/namespaces/psc.py b/feedparser/namespaces/psc.py
@@ -1,5 +1,5 @@
 # Support for the Podlove Simple Chapters format
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/parsers/loose.py b/feedparser/parsers/loose.py
@@ -1,5 +1,5 @@
 # The loose feed parser that interfaces with an SGML parsing library
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/parsers/strict.py b/feedparser/parsers/strict.py
@@ -1,5 +1,5 @@
 # The strict feed parser that interfaces with an XML parsing library
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/sanitizer.py b/feedparser/sanitizer.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/sgml.py b/feedparser/sgml.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/urls.py b/feedparser/urls.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/util.py b/feedparser/util.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2022 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/tests/runtests.py b/tests/runtests.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2004-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{36, 37, 38, 39}-{chardet, }
+envlist = py{36, 37, 38, 39}{-chardet, }
 skip_missing_interpreters = True
 
 [testenv]