From 2eeb1e74b22b80bc8109e13c790ab0d50400376d Mon Sep 17 00:00:00 2001 From: Michele Comitini Date: Fri, 25 Jan 2013 21:41:14 +0100 Subject: [PATCH] gluon/tools.py: correct error codes for Jsonrpc-2.0 exceptions. gluon/contrib/login_methods/oauth20_account.py: removed dead code. --- gluon/contrib/login_methods/oauth20_account.py | 2 -- gluon/tools.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gluon/contrib/login_methods/oauth20_account.py b/gluon/contrib/login_methods/oauth20_account.py index abc8f418..65357a49 100644 --- a/gluon/contrib/login_methods/oauth20_account.py +++ b/gluon/contrib/login_methods/oauth20_account.py @@ -157,8 +157,6 @@ server for requests. It can be used for the optional"scope" parameters for Face grant_type='authorization_code' ) - if False and self.args: - data.update(self.args) open_url = None opener = self.__build_url_opener(self.token_url) try: diff --git a/gluon/tools.py b/gluon/tools.py index 6b2da2c4..ae84a6c8 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4434,12 +4434,12 @@ class Service(object): return return_error(id, e.code, e.info) except BaseException: etype, eval, etb = sys.exc_info() - code = -32001 - data = '%s: %s\n' % (etype.__name__, eval) + request.is_local and traceback.format_tb(etb) + code = -32099 + data = '%s: %s\n' % (etype.__name__, eval) + str(request.is_local and traceback.format_tb(etb)) return return_error(id, code, data=data) except: etype, eval, etb = sys.exc_info() - return return_error(id, 32099, data='Exception %s: %s' % (etype, eval)) + return return_error(id, -32099, data='Exception %s: %s' % (etype, eval)) def serve_xmlrpc(self):