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

gluon/tools.py: correct error codes for Jsonrpc-2.0 exceptions.

Browse Source 
gluon/contrib/login_methods/oauth20_account.py: removed dead code.
This commit is contained in:
Michele Comitini
2013-01-25 21:41:14 +01:00
parent 9a957c907a
commit 2eeb1e74b2
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/oauth20_account.py
-2
View File
@@ -157,8 +157,6 @@ server for requests. It can be used for the optional"scope" parameters for Face
grant_type='authorization_code' grant_type='authorization_code'
) )
if False and self.args:
data.update(self.args)
open_url = None open_url = None
opener = self.__build_url_opener(self.token_url) opener = self.__build_url_opener(self.token_url)
try: try:
gluon/tools.py
+3 -3
View File
@@ -4434,12 +4434,12 @@ class Service(object):
return return_error(id, e.code, e.info) return return_error(id, e.code, e.info)
except BaseException: except BaseException:
etype, eval, etb = sys.exc_info() etype, eval, etb = sys.exc_info()
code = -32001 code = -32099
data = '%s: %s\n' % (etype.__name__, eval) + request.is_local and traceback.format_tb(etb) data = '%s: %s\n' % (etype.__name__, eval) + str(request.is_local and traceback.format_tb(etb))
return return_error(id, code, data=data) return return_error(id, code, data=data)
except: except:
etype, eval, etb = sys.exc_info() 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): def serve_xmlrpc(self):