Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-01-06 11:34:48 +01:00
Code Issues Projects Releases Wiki Activity

Convert bytes urls to strings when canonicalizing internal urls

Browse source
This commit is contained in:
Kovid Goyal 2021-09-10 18:23:42 +05:30
parent 78822589d8
commit 9a6d284cf4
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/calibre/web/feeds/news.py
View file

@ -681,7 +681,13 @@ def canonicalize_internal_url(self, url, is_link=True):
except Exception:
self.log.error('Failed to parse url: %r, ignoring' % url)
return frozenset()
return frozenset([(parts.netloc, (parts.path or '').rstrip('/'))])
nl = parts.netloc
path = parts.path or ''
if isinstance(nl, bytes):
nl = nl.decode('utf-8', 'replace')
if isinstance(path, bytes):
path = path.decode('utf-8', 'replace')
return frozenset({(nl, path.rstrip('/'))})
def index_to_soup(self, url_or_raw, raw=False, as_tree=False, save_raw=None):
'''