Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-27 04:04:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1886 (ValueError: invalid literal for float(): size) and #1887

Browse source
This commit is contained in:
Kovid Goyal 2009-02-24 22:49:10 -08:00
commit 6b4a26ef29
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/calibre/ebooks/lit/reader.py
View file

@ -276,8 +276,11 @@ def binary_to_text(self, base=0, depth=0):
state = 'get attr'
elif count > 0:
if not in_censorship:
self.buf.write(c.encode(
'ascii', 'xmlcharrefreplace'))
if c == '"':
c = '"'
elif c == '<':
c = '&lt;'
self.buf.write(c.encode('ascii', 'xmlcharrefreplace'))
count -= 1
if count == 0:
if not in_censorship:

4
src/calibre/ebooks/oeb/transforms/flatcss.py
View file

@ -37,6 +37,8 @@ def __init__(self, sbase, dbase, dkey):
@staticmethod
def relate(size, base):
if size == 0:
return base
size = float(size)
base = float(base)
if abs(size - base) < 0.1: return 0
@ -48,6 +50,7 @@ def relate(size, base):
return result
def __getitem__(self, ssize):
ssize = asfloat(ssize, 0)
if ssize in self.cache:
return self.cache[ssize]
dsize = self.map(ssize)
@ -66,6 +69,7 @@ def __init__(self, sbase, dbase):
self.dscale = float(dbase) / float(sbase)
def __getitem__(self, ssize):
ssize = asfloat(ssize, 0)
dsize = ssize * self.dscale
return dsize