mercurial/httppeer.py
changeset 36430 efebfa9b4cab
parent 36426 23d12524a202
child 36835 5bc7ff103081
--- a/mercurial/httppeer.py	Mon Feb 26 00:49:33 2018 -0500
+++ b/mercurial/httppeer.py	Mon Feb 26 00:50:35 2018 -0500
@@ -439,6 +439,11 @@
             if len(vals) < 2:
                 raise error.ResponseError(_("unexpected response:"), r)
             return vals
+        except urlerr.httperror:
+            # Catch and re-raise these so we don't try and treat them
+            # like generic socket errors. They lack any values in
+            # .args on Python 3 which breaks our socket.error block.
+            raise
         except socket.error as err:
             if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
                 raise error.Abort(_('push failed: %s') % err.args[1])