From f0104604387fb4bac50e5a94b6ad4186f8ba0707 Mon Sep 17 00:00:00 2001 From: Roland Meister Date: Sat, 10 Aug 2013 14:20:21 +0200 Subject: [PATCH] Unify exceptions caught in EpubBuilder.copy_image_files --- sphinx/builders/epub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py index e35c4e7d9..cd02c157a 100644 --- a/sphinx/builders/epub.py +++ b/sphinx/builders/epub.py @@ -410,7 +410,7 @@ class EpubBuilder(StandaloneHTMLBuilder): try: copyfile(path.join(self.srcdir, src), path.join(self.outdir, '_images', dest)) - except Exception, err: + except (IOError, OSError), err: self.warn('cannot copy image file %r: %s' % (path.join(self.srcdir, src), err)) continue @@ -426,7 +426,7 @@ class EpubBuilder(StandaloneHTMLBuilder): img = img.resize((nw, nh), Image.BICUBIC) try: img.save(path.join(self.outdir, '_images', dest)) - except IOError, err: + except (IOError, OSError), err: self.warn('cannot write image file %r: %s' % (path.join(self.srcdir, src), err))