From 151b22ddf020865720f36322fdb02c6be577f5cc Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 20 Feb 2013 09:23:54 +0000 Subject: [PATCH] fix exception handling in Python 2 --- makepanda/makepandacore.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 4142805a04..b27e72fdb1 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -903,7 +903,8 @@ def ReadFile(wfile): data = srchandle.read() srchandle.close() return data - except ex: + except: + ex = sys.exc_info()[1] exit("Cannot read %s: %s" % (wfile, ex)) def ReadBinaryFile(wfile): @@ -912,7 +913,8 @@ def ReadBinaryFile(wfile): data = srchandle.read() srchandle.close() return data - except ex: + except: + ex = sys.exc_info()[1] exit("Cannot read %s: %s" % (wfile, ex)) def WriteFile(wfile, data): @@ -920,7 +922,8 @@ def WriteFile(wfile, data): dsthandle = open(wfile, "w") dsthandle.write(data) dsthandle.close() - except ex: + except: + ex = sys.exc_info()[1] exit("Cannot write to %s: %s" % (wfile, ex)) def WriteBinaryFile(wfile, data): @@ -928,7 +931,8 @@ def WriteBinaryFile(wfile, data): dsthandle = open(wfile, "wb") dsthandle.write(data) dsthandle.close() - except ex: + except: + ex = sys.exc_info()[1] exit("Cannot write to %s: %s" % (wfile, ex)) def ConditionalWriteFile(dest, desiredcontents):