From 457dbf9a825153094ceee50d69fcc3acc67672bc Mon Sep 17 00:00:00 2001 From: "Marshall T. Vandegrift" Date: Wed, 6 Aug 2008 15:42:09 -0400 Subject: [PATCH] Fix some erroneously formed 'except' statements --- src/calibre/ebooks/metadata/meta.py | 4 ++-- src/calibre/ebooks/mobi/reader.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py index 15db121cb0..1c84af8009 100644 --- a/src/calibre/ebooks/metadata/meta.py +++ b/src/calibre/ebooks/metadata/meta.py @@ -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 diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py index 9c5ba7839f..7053b7591f 100644 --- a/src/calibre/ebooks/mobi/reader.py +++ b/src/calibre/ebooks/mobi/reader.py @@ -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'