This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9661

statichttprepo: explicitly convert error message to str (issue6247)
ClosedPublic

Authored by joerg.sonnenberger on Dec 27 2020, 7:31 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5135b393884b: statichttprepo: explicitly convert error message to str (issue6247)
Summary

For Python 2.7, the implicit conversion of the HTTPError instance to
str was good enough. For Python 3.x, this fails later when hitting the
str to bytes conversion logic.

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

joerg.sonnenberger added a comment.Dec 27 2020, 7:33 PM

This is for BZ issue 6247.

marmoute accepted this revision.Jan 8 2021, 11:12 AM
marmoute added a subscriber: marmoute.

maybe add a comment pointing the issue next to the str(…) call ?

marmoute accepted this revision.Jan 8 2021, 3:57 PM
pulkit added a subscriber: pulkit.Jan 9 2021, 5:02 AM
In D9661#145688, @joerg.sonnenberger wrote:

This is for BZ issue 6247.

For the bz bot to work, you will need to append (issueXXXX) to main commit description. https://www.mercurial-scm.org/wiki/ContributingChanges#Patch_descriptions

joerg.sonnenberger retitled this revision from statichttprepo: explicitly convert error message to str to statichttprepo: explicitly convert error message to str (issue6247).Jan 9 2021, 5:15 AM
pulkit accepted this revision.Jan 9 2021, 5:19 AM
This revision is now accepted and ready to land.Jan 9 2021, 5:19 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/statichttprepo.py (5 lines)

Diff 24690

mercurial/statichttprepo.py

req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))
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) # Explicitly convert the exception to str as Py3 will try
# convert it to local encoding and with as the HTTPResponse
# instance doesn't support encode.
raise IOError(num, str(inst))
except urlerr.urlerror as inst: except urlerr.urlerror as inst:
raise IOError(None, inst.reason) 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]