From 778cc3902b519274b571814ccb2e4f666cc23c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonel=20C=C3=A2mara?= Date: Fri, 25 Mar 2016 12:45:33 +0000 Subject: [PATCH 1/3] Update imageutils.py missing comma --- gluon/contrib/imageutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/contrib/imageutils.py b/gluon/contrib/imageutils.py index 2c241bb1..ef7343f0 100644 --- a/gluon/contrib/imageutils.py +++ b/gluon/contrib/imageutils.py @@ -27,7 +27,7 @@ from gluon import current class RESIZE(object): - def __init__(self, nx=160, ny=80, quality=100, padding = False + def __init__(self, nx=160, ny=80, quality=100, padding = False, error_message=' image resize'): (self.nx, self.ny, self.quality, self.error_message, self.padding) = ( nx, ny, quality, error_message, padding) From ebcf6e5671cfa266598148982dcd505c08f06d58 Mon Sep 17 00:00:00 2001 From: Pierre Thibault Date: Fri, 25 Mar 2016 15:48:58 -0400 Subject: [PATCH 2/3] Nonsense sys.exc_info parameter of traceback.format_exc calls. --- gluon/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon/admin.py b/gluon/admin.py index cf8627a3..4d772d7e 100644 --- a/gluon/admin.py +++ b/gluon/admin.py @@ -148,7 +148,7 @@ def app_compile(app, request, skip_failed_views=False): failed_views = compile_application(folder, skip_failed_views) return failed_views except (Exception, RestrictedError): - tb = traceback.format_exc(sys.exc_info) + tb = traceback.format_exc() remove_compiled_application(folder) return tb @@ -167,7 +167,7 @@ def app_create(app, request, force=False, key=None, info=False): os.mkdir(path) except: if info: - return False, traceback.format_exc(sys.exc_info) + return False, traceback.format_exc() else: return False elif not force: From d2d16d408158af1b03a5f47c349f83b41793a726 Mon Sep 17 00:00:00 2001 From: Pierre Thibault Date: Fri, 25 Mar 2016 15:54:01 -0400 Subject: [PATCH 3/3] I was forgetting line 200. --- gluon/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/admin.py b/gluon/admin.py index 4d772d7e..f482779d 100644 --- a/gluon/admin.py +++ b/gluon/admin.py @@ -197,7 +197,7 @@ def app_create(app, request, force=False, key=None, info=False): except: rmtree(path) if info: - return False, traceback.format_exc(sys.exc_info) + return False, traceback.format_exc() else: return False