summaryrefslogtreecommitdiff
path: root/tablib/packages/openpyxl/reader/excel.py
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2011-05-12 19:16:24 -0400
committerKenneth Reitz <me@kennethreitz.com>2011-05-12 19:16:24 -0400
commit690de63b7c0c1431151c308c67f8d344f15d6a65 (patch)
treeca4d27cf5833a21bd2cf769563ae2cc6e0cc35d7 /tablib/packages/openpyxl/reader/excel.py
parent6b6ef70c61e1f35ea1b26535a2bec33a74be6bdf (diff)
downloadtablib-690de63b7c0c1431151c308c67f8d344f15d6a65.tar.gz
ugh
Diffstat (limited to 'tablib/packages/openpyxl/reader/excel.py')
-rw-r--r--tablib/packages/openpyxl/reader/excel.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tablib/packages/openpyxl/reader/excel.py b/tablib/packages/openpyxl/reader/excel.py
index 3dc6547..16c3f91 100644
--- a/tablib/packages/openpyxl/reader/excel.py
+++ b/tablib/packages/openpyxl/reader/excel.py
@@ -66,8 +66,8 @@ def load_workbook(filename, use_iterators = False):
try:
archive = ZipFile(filename, 'r', ZIP_DEFLATED)
- except (BadZipfile, RuntimeError, IOError, ValueError), e:
- raise InvalidFileException(unicode(e))
+ except (BadZipfile, RuntimeError, IOError, ValueError):
+ raise InvalidFileException()
wb = Workbook()
if use_iterators:
@@ -75,10 +75,8 @@ def load_workbook(filename, use_iterators = False):
try:
_load_workbook(wb, archive, filename, use_iterators)
- except KeyError, e:
- raise InvalidFileException(unicode(e))
- except Exception, e:
- raise e
+ except KeyError:
+ raise InvalidFileException()
finally:
archive.close()
return wb