From: Martin Pitt <mpitt@debian.org>
Date: Mon, 14 Nov 2016 22:41:23 +0100
Subject: Use packaged instead of bundled feedparser Python module

---
 recipes/lenta_ru.recipe           | 4 +++-
 src/calibre/web/feeds/__init__.py | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes/lenta_ru.recipe b/recipes/lenta_ru.recipe
index aa4dac4..4b6710c 100644
--- a/recipes/lenta_ru.recipe
+++ b/recipes/lenta_ru.recipe
@@ -4,11 +4,13 @@
 Lenta.ru
 '''
 
-from calibre.web.feeds.feedparser import parse
 from calibre.ebooks.BeautifulSoup import Tag
 from calibre.web.feeds.news import BasicNewsRecipe
+from feedparser import parse
+from functools import partial
 import re
 
+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
 
 class LentaRURecipe(BasicNewsRecipe):
     title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438'
diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
index 8c9d748..f262604 100644
--- a/src/calibre/web/feeds/__init__.py
+++ b/src/calibre/web/feeds/__init__.py
@@ -11,7 +11,10 @@ from calibre.utils.logging import default_log
 from calibre import entity_to_unicode, strftime, force_unicode
 from calibre.utils.date import dt_factory, utcnow, local_tz
 from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
+from feedparser import parse
+from functools import partial
 
+parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11')
 
 class Article(object):
 
@@ -334,7 +337,6 @@ def feed_from_xml(raw_xml, title=None, oldest_article=7,
                   max_articles_per_feed=100,
                   get_article_url=lambda item: item.get('link', None),
                   log=default_log):
-    from calibre.web.feeds.feedparser import parse
     # Handle unclosed escaped entities. They trip up feedparser and HBR for one
     # generates them
     raw_xml = re.sub(r'(&amp;#\d+)([^0-9;])', r'\1;\2', raw_xml)
t</a>/<a href='/guix/commit/gnu?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>gnu</a>/<a href='/guix/commit/gnu/packages?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>packages</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='cde7374a9eaf0f6ab80cc9dac353892c9bf44245'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Nicolas Goaziou &lt;mail@nicolasgoaziou.fr&gt;</td><td class='right'>2024-05-28 00:22:08 +0200</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2024-08-31 10:45:25 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/packages?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>cde7374a9eaf0f6ab80cc9dac353892c9bf44245</a> (<a href='/guix/patch/gnu/packages?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>0eb866bd2d6e19fe551cf67d4d1ef3d4ffc1de4b</a> /<a href='/guix/tree/gnu/packages?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>gnu/packages</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/packages?id=ac9798bf4b38189888bc738b90e314d64c7c29b5'>ac9798bf4b38189888bc738b90e314d64c7c29b5</a> (<a href='/guix/diff/gnu/packages?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245&amp;id2=ac9798bf4b38189888bc738b90e314d64c7c29b5'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-cde7374a9eaf0f6ab80cc9dac353892c9bf44245.tar.gz'>guix-cde7374a9eaf0f6ab80cc9dac353892c9bf44245.tar.gz</a><br/><a href='/guix/snapshot/guix-cde7374a9eaf0f6ab80cc9dac353892c9bf44245.zip'>guix-cde7374a9eaf0f6ab80cc9dac353892c9bf44245.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: Add texlive-xdvi-bin.</div><div class='commit-msg'>* gnu/packages/tex.scm (texlive-xdvi-bin): New variable.
(texlive-xdvi)[propagated-inputs]: Add TEXLIVE-XDVI-BIN.

Change-Id: I305992d58740cf23e89aa175fa81109fa1923f04
</div><div class='diffstat-header'><a href='/guix/diff/?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>Diffstat</a> (limited to 'gnu/packages')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/tex.scm?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>gnu/packages/tex.scm</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='48%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 48 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm<br/>index 5cf49673c4..3e2c194a91 100644<br/>--- a/<a href='/guix/tree/gnu/packages/tex.scm?id=ac9798bf4b38189888bc738b90e314d64c7c29b5'>gnu/packages/tex.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/tex.scm?id=cde7374a9eaf0f6ab80cc9dac353892c9bf44245'>gnu/packages/tex.scm</a></div>