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-09-12 20:34:39 +05:30
parent 187eb4e065
commit 7d1c82aad2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/ebooks/metadata/odt.py
View File

@ -122,7 +122,7 @@ class odfmetaparser(xml.sax.saxutils.XMLGenerator):
if name == (OFFICENS,u'meta'): if name == (OFFICENS,u'meta'):
for k,v in self.addfields.items(): for k,v in self.addfields.items():
if len(v) > 0: if len(v) > 0:
if type(k) == type(''): if isinstance(k, basestring):
xml.sax.saxutils.XMLGenerator.startElementNS(self,(METANS,u'user-defined'),None,{(METANS,u'name'):k}) xml.sax.saxutils.XMLGenerator.startElementNS(self,(METANS,u'user-defined'),None,{(METANS,u'name'):k})
xml.sax.saxutils.XMLGenerator.characters(self, v) xml.sax.saxutils.XMLGenerator.characters(self, v)
xml.sax.saxutils.XMLGenerator.endElementNS(self, (METANS,u'user-defined'),None) xml.sax.saxutils.XMLGenerator.endElementNS(self, (METANS,u'user-defined'),None)
@ -165,19 +165,19 @@ def get_metadata(stream, extract_cover=True):
parser.parse(StringIO(content)) parser.parse(StringIO(content))
data = odfs.seenfields data = odfs.seenfields
mi = MetaInformation(None, []) mi = MetaInformation(None, [])
if data.has_key('title'): if 'title' in data:
mi.title = data['title'] mi.title = data['title']
if data.get('initial-creator', '').strip(): if data.get('initial-creator', '').strip():
mi.authors = string_to_authors(data['initial-creator']) mi.authors = string_to_authors(data['initial-creator'])
elif data.has_key('creator'): elif 'creator' in data:
mi.authors = string_to_authors(data['creator']) mi.authors = string_to_authors(data['creator'])
if data.has_key('description'): if 'description' in data:
mi.comments = data['description'] mi.comments = data['description']
if data.has_key('language'): if 'language' in data:
mi.language = data['language'] mi.language = data['language']
if data.get('keywords', ''): if data.get('keywords', ''):
mi.tags = [x.strip() for x in data['keywords'].split(',') if x.strip()] mi.tags = [x.strip() for x in data['keywords'].split(',') if x.strip()]
opfmeta = False # we need this later for the cover opfmeta = False # we need this later for the cover
opfnocover = False opfnocover = False
if data.get('opf.metadata','') == 'true': if data.get('opf.metadata','') == 'true':
# custom metadata contains OPF information # custom metadata contains OPF information
@ -212,7 +212,7 @@ def get_metadata(stream, extract_cover=True):
try: try:
read_cover(stream, zin, mi, opfmeta, extract_cover) read_cover(stream, zin, mi, opfmeta, extract_cover)
except: except:
pass # Do not let an error reading the cover prevent reading other data pass # Do not let an error reading the cover prevent reading other data
return mi return mi
@ -242,7 +242,7 @@ def read_cover(stream, zin, mi, opfmeta, extract_cover):
if opfmeta and frm.getAttribute('name').lower() == u'opf.cover': if opfmeta and frm.getAttribute('name').lower() == u'opf.cover':
cover_href = i_href cover_href = i_href
cover_data = (fmt, raw) cover_data = (fmt, raw)
cover_frame = frm.getAttribute('name') # could have upper case cover_frame = frm.getAttribute('name') # could have upper case
break break
if cover_href is None and imgnum == 1 and 0.8 <= height/width <= 1.8 and height*width >= 12000: if cover_href is None and imgnum == 1 and 0.8 <= height/width <= 1.8 and height*width >= 12000:
# Pick the first image as the cover if it is of a suitable size # Pick the first image as the cover if it is of a suitable size