mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix some erroneously formed 'except' statements
This commit is contained in:
commit
89986bb5ac
@ -134,12 +134,12 @@ def metadata_from_filename(name, pat=None):
|
|||||||
try:
|
try:
|
||||||
si = match.group('series_index')
|
si = match.group('series_index')
|
||||||
mi.series_index = int(si)
|
mi.series_index = int(si)
|
||||||
except IndexError, ValueError:
|
except (IndexError, ValueError):
|
||||||
pass
|
pass
|
||||||
try:
|
try:
|
||||||
si = match.group('isbn')
|
si = match.group('isbn')
|
||||||
mi.isbn = si
|
mi.isbn = si
|
||||||
except IndexError, ValueError:
|
except (IndexError, ValueError):
|
||||||
pass
|
pass
|
||||||
if not mi.title:
|
if not mi.title:
|
||||||
mi.title = name
|
mi.title = name
|
||||||
|
@ -93,7 +93,7 @@ class BookHeader(object):
|
|||||||
1252 : 'cp1252',
|
1252 : 'cp1252',
|
||||||
65001 : 'utf-8',
|
65001 : 'utf-8',
|
||||||
}[self.codepage]
|
}[self.codepage]
|
||||||
except IndexError, KeyError:
|
except (IndexError, KeyError):
|
||||||
print '[WARNING] Unknown codepage %d. Assuming cp-1252'%self.codepage
|
print '[WARNING] Unknown codepage %d. Assuming cp-1252'%self.codepage
|
||||||
self.codec = 'cp1252'
|
self.codec = 'cp1252'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user