This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5715

statichttprepo: use URLError.reason directly
ClosedPublic

Authored by indygreg on Jan 26 2019, 2:43 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2bf689b13a17: statichttprepo: use URLError.reason directly
Summary

0b3f4be5c5bf changed str(inst) to inst.reason[0] all the way back
in 2006. URLError.reason is a str and we should have taken that
attribute in its entirety. I think the code was supposed to be
inst.args[1] for compatibility with ancient Python versions.
Python 2.7 always sets .reason, so it should be safe to use
directly.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 26 2019, 2:43 PM
pulkit accepted this revision.Jan 26 2019, 4:33 PM
Closed by commit rHG2bf689b13a17: statichttprepo: use URLError.reason directly (authored by indygreg). · Explain WhyJan 26 2019, 4:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/statichttprepo.py (2 lines)

Diff 13515

mercurial/statichttprepo.py

try: try:
f = self.opener.open(req) f = self.opener.open(req)
data = f.read() data = f.read()
code = f.code code = f.code
except urlerr.httperror as inst: except urlerr.httperror as inst:
num = inst.code == 404 and errno.ENOENT or None num = inst.code == 404 and errno.ENOENT or None
raise IOError(num, inst) raise IOError(num, inst)
except urlerr.urlerror as inst: except urlerr.urlerror as inst:
raise IOError(None, inst.reason[1]) raise IOError(None, inst.reason)
if code == 200: if code == 200:
# HTTPRangeHandler does nothing if remote does not support # HTTPRangeHandler does nothing if remote does not support
# Range headers and returns the full entity. Let's slice it. # Range headers and returns the full entity. Let's slice it.
if bytes: if bytes:
data = data[self.pos:self.pos + bytes] data = data[self.pos:self.pos + bytes]
else: else:
data = data[self.pos:] data = data[self.pos:]