Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions supervisor/xmlrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def more(self):

return self.getresponse(body)

except:
except Exception:
tb = traceback.format_exc()
self.request.channel.server.logger.log(
"XML-RPC response callback error", tb
Expand Down Expand Up @@ -247,7 +247,7 @@ def multi(remaining_calls=remaining_calls,
except RPCError as exc:
value = {'faultCode': exc.code,
'faultString': exc.text}
except:
except Exception:
info = sys.exc_info()
errmsg = "%s:%s" % (info[0], info[1])
value = {'faultCode': Faults.FAILED,
Expand Down Expand Up @@ -276,7 +276,7 @@ def multi(remaining_calls=remaining_calls,
except RPCError as exc:
value = {'faultCode': exc.code,
'faultString': exc.text}
except:
except Exception:
info = sys.exc_info()
errmsg = "%s:%s" % (info[0], info[1])
value = {'faultCode': Faults.FAILED,
Expand Down Expand Up @@ -383,7 +383,7 @@ def continue_request(self, data, request):
if PY2:
data = data.encode('ascii', 'xmlcharrefreplace')
params, method = self.loads(data)
except:
except Exception:
logger.error(
'XML-RPC request data %r is invalid: unmarshallable' %
(data,)
Expand Down Expand Up @@ -433,7 +433,7 @@ def continue_request(self, data, request):
request.push(body)
request.done()

except:
except Exception:
tb = traceback.format_exc()
logger.critical(
"Handling XML-RPC request with data %r raised an unexpected "
Expand Down
Loading