Release 6.0.12 (#526)

kurtmckee · web-flow · commit 9c03a51a209a · 2025-09-10T08:22:14.000-05:00
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,13 @@
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  builder: "html"
+  configuration: "docs/conf.py"
+  fail_on_warning: true
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-2023 Kurt McKee <contactme@kurtmckee.org>
+Copyright (C) 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+Copyright (C) 2010-2025 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,10 @@
 coming in the next release:
 
+6.0.12 - 10 September 2025
+    *   Fix an ``AssertionError`` crash that occurs with Python 3.10 and higher. (#304)
+    *   Fix a ``DeprecationWarning`` thrown during calls to ``re.sub``. (#389)
+    *   Add a Read the Docs configuration.
+
 6.0.11 - 9 December 2023
     *   Resolve ``cgi`` module deprecation warnings. (#330)
 
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 ..
     This file is part of feedparser.
-    Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
+    Copyright 2010-2025 Kurt McKee <contactme@kurtmckee.org>
     Copyright 2002-2008 Mark Pilgrim
     Released under the BSD 2-clause license.
 
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
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,7 +11,7 @@
 
 # project information
 project = 'feedparser'
-copyright = '2010-2023 Kurt McKee, 2004-2008 Mark Pilgrim'
+copyright = '2010-2025 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-2023 Kurt McKee, 2004-2008 Mark Pilgrim. All rights reserved.
+Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2020-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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.11'
+__version__ = '6.0.12'
 
 # 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
diff --git a/feedparser/exceptions.py b/feedparser/exceptions.py
@@ -1,5 +1,5 @@
 # Exceptions used throughout feedparser
-# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -149,7 +149,7 @@ def feed(self, data):
         :rtype: None
         """
 
-        data = re.sub(r'<!((?!DOCTYPE|--|\[))', r'&lt;!\1', data, re.IGNORECASE)
+        data = re.sub(r"<!((?!DOCTYPE|--|\[))", r"&lt;!\1", data, flags=re.IGNORECASE)
         data = re.sub(r'<([^<>\s]+?)\s*/>', self._shorttag_replace, data)
         data = data.replace('&#39;', "'")
         data = data.replace('&#34;', '"')
@@ -349,7 +349,7 @@ def parse_declaration(self, i):
 
         try:
             return sgmllib.SGMLParser.parse_declaration(self, i)
-        except sgmllib.SGMLParseError:
+        except (AssertionError, sgmllib.SGMLParseError):
             # Escape the doctype declaration and continue parsing.
             self.handle_data('&lt;')
             return i+1
diff --git a/feedparser/http.py b/feedparser/http.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 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-2023 Kurt McKee <contactme@kurtmckee.org>
+# Copyright 2010-2025 Kurt McKee <contactme@kurtmckee.org>
 # Copyright 2004-2008 Mark Pilgrim
 # All rights reserved.
 #

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# The public API for feedparser`
`2`		`-# Copyright 2010-2023 Kurt McKee <contactme@kurtmckee.org>`
	`2`	`+# Copyright 2010-2025 Kurt McKee <contactme@kurtmckee.org>`
`3`	`3`	`# Copyright 2002-2008 Mark Pilgrim`
`4`	`4`	`# All rights reserved.`
`5`	`5`	`#`