##// END OF EJS Templates
httppeer: explicitly catch urlerr.httperror and re-raise...
Augie Fackler -
r36448:efebfa9b default
parent child Browse files
Show More
@@ -439,6 +439,11 b' class httppeer(wireproto.wirepeer):'
439 if len(vals) < 2:
439 if len(vals) < 2:
440 raise error.ResponseError(_("unexpected response:"), r)
440 raise error.ResponseError(_("unexpected response:"), r)
441 return vals
441 return vals
442 except urlerr.httperror:
443 # Catch and re-raise these so we don't try and treat them
444 # like generic socket errors. They lack any values in
445 # .args on Python 3 which breaks our socket.error block.
446 raise
442 except socket.error as err:
447 except socket.error as err:
443 if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
448 if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
444 raise error.Abort(_('push failed: %s') % err.args[1])
449 raise error.Abort(_('push failed: %s') % err.args[1])
General Comments 0
You need to be logged in to leave comments. Login now