dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2016-03-25 23:57:24 -05:00
parent 46dc83a1bb 460a017bab
commit d4572c5f38
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gluon/admin.py
View File

@@ -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:
@@ -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

2
gluon/contrib/imageutils.py
View File

@@ -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)