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

Browse Source
This commit is contained in:
Kovid Goyal 2013-04-14 22:15:11 +05:30
parent 5f3f5d1e9b
commit 07bbcef4ff
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/ebooks/oeb/polish/container.py
View File

@ -30,7 +30,7 @@ from calibre.ebooks.oeb.base import (
from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError from calibre.ebooks.oeb.polish.errors import InvalidBook, DRMError
from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER from calibre.ebooks.oeb.parse_utils import NotHTML, parse_html, RECOVER_PARSER
from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryDirectory, PersistentTemporaryFile
from calibre.utils.ipc.simple_worker import fork_job, WorkerError from calibre.utils.ipc.simple_worker import fork_job, WorkerError
from calibre.utils.logging import default_log from calibre.utils.logging import default_log
from calibre.utils.zipfile import ZipFile from calibre.utils.zipfile import ZipFile
@ -406,8 +406,9 @@ class Container(object):
child.get('content', '').strip() in {'{}', ''}): child.get('content', '').strip() in {'{}', ''}):
remove.add(child) remove.add(child)
except AttributeError: except AttributeError:
continue # Happens for XML comments continue # Happens for XML comments
for child in remove: mdata.remove(child) for child in remove:
mdata.remove(child)
if len(mdata) > 0: if len(mdata) > 0:
mdata[-1].tail = '\n ' mdata[-1].tail = '\n '
@ -473,12 +474,12 @@ class EpubContainer(Container):
book_type = 'epub' book_type = 'epub'
META_INF = { META_INF = {
'container.xml' : True, 'container.xml': True,
'manifest.xml' : False, 'manifest.xml': False,
'encryption.xml' : False, 'encryption.xml': False,
'metadata.xml' : False, 'metadata.xml': False,
'signatures.xml' : False, 'signatures.xml': False,
'rights.xml' : False, 'rights.xml': False,
} }
def __init__(self, pathtoepub, log): def __init__(self, pathtoepub, log):
@ -670,7 +671,8 @@ class AZW3Container(Container):
# }}} # }}}
def get_container(path, log=None): def get_container(path, log=None):
if log is None: log = default_log if log is None:
log = default_log
ebook = (AZW3Container if path.rpartition('.')[-1].lower() in {'azw3', 'mobi'} ebook = (AZW3Container if path.rpartition('.')[-1].lower() in {'azw3', 'mobi'}
else EpubContainer)(path, log) else EpubContainer)(path, log)
return ebook return ebook