From 3fd459098a5b511a35874dac02fafca687234801 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 20 May 2011 10:23:43 +0200 Subject: [PATCH] [FIX] 'except Exception as variable' is invalid syntax in Python 2.5 bzr revid: xmo@openerp.com-20110520082343-y7uhx6vbf1afwfxj --- addons/base/controllers/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 88fb05e89f7..9ce3c0f58e8 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -565,7 +565,7 @@ class FormView(View): else: res = Model.read([int(id)], [field], request.context)[0].get(field, '') return base64.decodestring(res) - except: + except: # TODO: what's the exception here? return self.placeholder() def placeholder(self): return open(os.path.join(openerpweb.path_addons, 'base', 'static', 'src', 'img', 'placeholder.png'), 'rb').read() @@ -608,7 +608,7 @@ class FormView(View): """ data = ufile.file.read() args = [size, ufile.filename, ufile.headers.getheader('Content-Type'), base64.encodestring(data)] - except Exception as e: + except Exception, e: args = [False, e.message] return out % (simplejson.dumps(callback), simplejson.dumps(args))