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:
parent
ecbf38a3d6
commit
457dbf9a82
@ -134,12 +134,12 @@ def metadata_from_filename(name, pat=None):
|
||||
try:
|
||||
si = match.group('series_index')
|
||||
mi.series_index = int(si)
|
||||
except IndexError, ValueError:
|
||||
except (IndexError, ValueError):
|
||||
pass
|
||||
try:
|
||||
si = match.group('isbn')
|
||||
mi.isbn = si
|
||||
except IndexError, ValueError:
|
||||
except (IndexError, ValueError):
|
||||
pass
|
||||
if not mi.title:
|
||||
mi.title = name
|
||||
|
@ -93,7 +93,7 @@ class BookHeader(object):
|
||||
1252 : 'cp1252',
|
||||
65001 : 'utf-8',
|
||||
}[self.codepage]
|
||||
except IndexError, KeyError:
|
||||
except (IndexError, KeyError):
|
||||
print '[WARNING] Unknown codepage %d. Assuming cp-1252'%self.codepage
|
||||
self.codec = 'cp1252'
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user