Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-05 20:23:43 +02:00
Code Issues Projects Releases Wiki Activity

News download: Handle URLs that have commas and non ascii characters correctly

Browse source
This commit is contained in:
Kovid Goyal 2010-01-09 14:24:48 -07:00
parent 5b4b130468
commit e9254aa75a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/calibre/ebooks/txt/input.py
View file

@ -55,7 +55,7 @@ def convert(self, stream, options, file_ext, log,
html = convert_markdown(txt, disable_toc=options.markdown_disable_toc)
except RuntimeError:
raise ValueError('This txt file has malformed markup, it cannot be'
'converted by calibre. See http://daringfireball.net/projects/markdown/syntax')
' converted by calibre. See http://daringfireball.net/projects/markdown/syntax')
else:
html = convert_basic(txt)

4
src/calibre/web/fetch/simple.py
View file

@ -191,9 +191,9 @@ def fetch_url(self, url):
if isinstance(url, unicode):
url = url.encode('utf-8')
# Not sure is this is really needed as I think mechanize
# handles quoting automatically, but leaving it in
# handles quoting automatically, but leaving it
# in case it breaks something
if re.search(r'\s+|,', url) is not None:
if re.search(r'\s+', url) is not None:
purl = list(urlparse.urlparse(url))
for i in range(2, 6):
purl[i] = quote(purl[i])