Merge lp:~hideaki-t/calibre/calibre into lp:calibre

[Hideaki Takahashi]

this brunch fixes a problem that cannot convert to KF8 format from a ebook containing quoted non UTF-8 encoding links.

[lp:~hideaki-t/calibre/calibre]

15147. By Hideaki Takahashi on 2013-09-16

Merge from trunk

[Kovid Goyal (kovid)]

calibre development has moved to using git n github. See http://www.mobileread.com/forums/showthread.php?t=214465
I have merged your patch there.

review: Disapprove

[Hideaki Takahashi (hideaki-t)]

Thank you for your comment, and sorry to bother you.
I did not realized that.

Unmerged revisions

15147. By Hideaki Takahashi on 2013-09-16

Merge from trunk

15146. By Hideaki Takahashi on 2013-09-14

MOBI(KF8) output: avoid UnicodeDecodeError for not utf-8 encoded links.
see bug #1181049 and http://bazaar.launchpad.net/~kovid/calibre/trunk/revision/15030

=== modified file 'src/calibre/ebooks/mobi/writer8/main.py'
--- src/calibre/ebooks/mobi/writer8/main.py	2013-02-03 11:33:07 +0000
+++ src/calibre/ebooks/mobi/writer8/main.py	2013-09-16 11:54:25 +0000
@@ -227,7 +227,11 @@
                 count += 1
                 ref = item.abshref(a.get('href'))
                 href, _, frag = ref.partition('#')
-                href = urlnormalize(href)
+                try:
+                    href = urlnormalize(href)
+                except ValueError:
+                    # href has non utf-8 quoting
+                    pass
                 if href in hrefs:
                     placeholder = 'kindle:pos:fid:0000:off:%s'%to_href(count)
                     self.link_map[placeholder] = (href, frag)