Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

pep8 and code simplification

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-25 17:28:45 +05:30
parent 05b97d86e0
commit f8a2449d7f
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/docx/cleanup.py
View File

@ -220,4 +220,3 @@ def cleanup_markup(log, root, styles, dest_dir, detect_cover, XPath):
log.debug('Detected an image that looks like a cover') log.debug('Detected an image that looks like a cover')
img.getparent().remove(img) img.getparent().remove(img)
return path return path

14
src/calibre/ebooks/docx/toc.py
View File

@ -7,6 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
from collections import namedtuple from collections import namedtuple
from itertools import count
from lxml.etree import tostring from lxml.etree import tostring
@ -14,14 +15,6 @@ from calibre.ebooks.metadata.toc import TOC
from calibre.ebooks.oeb.polish.toc import elem_to_toc_text from calibre.ebooks.oeb.polish.toc import elem_to_toc_text
class Count(object):
__slots__ = ('val',)
def __init__(self):
self.val = 0
def from_headings(body, log, namespace): def from_headings(body, log, namespace):
' Create a TOC from headings in the document ' ' Create a TOC from headings in the document '
XPath, descendants = namespace.XPath, namespace.descendants XPath, descendants = namespace.XPath, namespace.descendants
@ -33,13 +26,12 @@ def from_headings(body, log, namespace):
level_item_map = {i+1:frozenset(xp(body)) for i, xp in enumerate(xpaths)} level_item_map = {i+1:frozenset(xp(body)) for i, xp in enumerate(xpaths)}
item_level_map = {e:i for i, elems in level_item_map.iteritems() for e in elems} item_level_map = {e:i for i, elems in level_item_map.iteritems() for e in elems}
idcount = Count() idcount = count()
def ensure_id(elem): def ensure_id(elem):
ans = elem.get('id', None) ans = elem.get('id', None)
if not ans: if not ans:
idcount.val += 1 ans = 'toc_id_%d' % (next(idcount) + 1)
ans = 'toc_id_%d' % idcount.val
elem.set('id', ans) elem.set('id', ans)
return ans return ans