Merge branch 'release-6.0.10'

kurtmckee · May 21, 2022 · 32adbe1 · 32adbe1
2 parents 6280520 + b7cffc9
commit 32adbe1
Show file tree

Hide file tree

Showing 38 changed files with 57 additions and 40 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-2021 Kurt McKee <[email protected]>
+Copyright (C) 2010-2022 Kurt McKee <[email protected]>
 Copyright (C) 2002-2008 Mark Pilgrim
 All rights reserved.
 
@@ -38,7 +38,7 @@ released under the following license:
 
 ----- begin license block -----
 
-Copyright (C) 2010-2021 Kurt McKee <[email protected]>
+Copyright (C) 2010-2022 Kurt McKee <[email protected]>
 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.10 - 21 May 2022
+    *   Populate ``<summary>`` correctly if it comes after ``<content>``. (#260)
+
 6.0.9 - 19 May 2022
     *   Fix a crash that can occur with GeoRSS feeds that lack a ``<where>`` tag. (#305)
 

diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 feedparser - Parse Atom and RSS feeds in Python.
 
-| Copyright 2010-2021 Kurt McKee <[email protected]>
+| Copyright 2010-2022 Kurt McKee <[email protected]>
 | Copyright 2002-2008 Mark Pilgrim
 
 feedparser is open source. See the LICENSE file for more information.

diff --git a/docs/conf.py b/docs/conf.py
@@ -11,7 +11,7 @@
 
 # project information
 project = 'feedparser'
-copyright = '2010-2021 Kurt McKee, 2004-2008 Mark Pilgrim'
+copyright = '2010-2022 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-2021 Kurt McKee, 2004-2008 Mark Pilgrim. All rights reserved.
+Copyright 2010-2022 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-2021 Kurt McKee <[email protected]>
+# Copyright 2020-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -32,7 +32,7 @@
 
 __author__ = 'Kurt McKee <[email protected]>'
 __license__ = 'BSD 2-clause'
-__version__ = '6.0.9'
+__version__ = '6.0.10'
 
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/html.py b/feedparser/html.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/http.py b/feedparser/http.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/mixin.py b/feedparser/mixin.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -193,6 +193,7 @@ def __init__(self):
         self.svgOK = 0
         self.title_depth = -1
         self.depth = 0
+        self.hasContent = 0
         if self.lang:
             self.feeddata['language'] = self.lang.replace('_', '-')
 

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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #
@@ -259,6 +259,7 @@ def _start_item(self, attrs_d):
     def _end_item(self):
         self.pop('item')
         self.inentry = 0
+        self.hasContent = 0
     _end_entry = _end_item
 
     def _start_language(self, attrs_d):
@@ -388,7 +389,7 @@ def _end_title(self):
 
     def _start_description(self, attrs_d):
         context = self._get_context()
-        if 'summary' in context:
+        if 'summary' in context and not self.hasContent:
             self._summaryKey = 'content'
             self._start_content(attrs_d)
         else:
@@ -429,7 +430,7 @@ def _end_generator(self):
 
     def _start_summary(self, attrs_d):
         context = self._get_context()
-        if 'summary' in context:
+        if 'summary' in context and not self.hasContent:
             self._summaryKey = 'content'
             self._start_content(attrs_d)
         else:
@@ -466,6 +467,7 @@ def _end_source(self):
         self.sourcedata.clear()
 
     def _start_content(self, attrs_d):
+        self.hasContent = 1
         self.push_content('content', attrs_d, 'text/plain', 1)
         src = attrs_d.get('src')
         if src:
@@ -477,6 +479,7 @@ def _start_body(self, attrs_d):
     _start_xhtml_body = _start_body
 
     def _start_content_encoded(self, attrs_d):
+        self.hasContent = 1
         self.push_content('content', attrs_d, 'text/html', 1)
     _start_fullitem = _start_content_encoded
 

diff --git a/feedparser/namespaces/admin.py b/feedparser/namespaces/admin.py
@@ -1,5 +1,5 @@
 # Support for the administrative elements extension
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # 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-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/sanitizer.py b/feedparser/sanitizer.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/sgml.py b/feedparser/sgml.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/urls.py b/feedparser/urls.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/feedparser/util.py b/feedparser/util.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Kurt McKee <[email protected]>
+# Copyright 2010-2022 Kurt McKee <[email protected]>
 # Copyright 2002-2008 Mark Pilgrim
 # All rights reserved.
 #

diff --git a/tests/wellformed/atom10/entry_content_and_summary.xml b/tests/wellformed/atom10/entry_content_and_summary.xml
@@ -0,0 +1,10 @@
+<!--
+Description: entry summary follows content with different value
+Expect:      not bozo and entries[0]['summary'] == 'Summary'
+-->
+<feed xmlns="http://www.w3.org/2005/Atom">
+<entry>
+  <content>Example Atom</content>
+  <summary>Summary</summary>
+</entry>
+</feed>