From 8d923a5765b24dc3b9fa5156ae239afe99351b9a Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 21 Aug 2012 08:52:06 -0500 Subject: [PATCH] fixed backward compatibility issue formstyles, thanks Dominic --- VERSION | 2 +- applications/admin/controllers/default.py | 1 + gluon/sqlhtml.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3c6269ed..b193c7ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-21 07:57:05) dev +Version 2.00.0 (2012-08-21 08:52:02) dev diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 16e09491..cec8bef9 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -1379,6 +1379,7 @@ def errors(): return dict(errors = [x[1] for x in decorated], app=app, method=method, db_ready=db_ready) + elif method == 'dbnew': errors_path = apath('%s/errors' % app, r=request) tk_db, tk_table = get_ticket_storage(app) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 91d5cfb6..09b7508e 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1086,7 +1086,8 @@ class SQLFORM(FORM): if callable(self.formstyle): # backward compatibility, 4 argument function is the old style - if len(inspect.getargspec(self.formstyle)[0]) == 4: + args, varargs, keywords, defaults = inspect.getargspec(self.formstyle) + if defaults and len(args) - len(defaults) == 4 or len(args) == 4: table = TABLE() for id,a,b,c in xfields: raw_b = self.field_parent[id] = b @@ -1815,7 +1816,7 @@ class SQLFORM(FORM): filename = '.'.join(('rows', oExp.file_ext)) response.headers['Content-Type'] = oExp.content_type response.headers['Content-Disposition'] = \ - 'attachment;filename='+filename+';' + 'attachment;filename='+filename+';' raise HTTP(200, oExp.export(),**response.headers) elif request.vars.records and not isinstance(