This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5716

statichttprepo: use str to appease Python 3
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6e9bebb65ce7: statichttprepo: use str to appease Python 3
Summary

The URL fed into urllib and HTTP headers need to be str on
Python 3.

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:34 PM
Closed by commit rHG6e9bebb65ce7: statichttprepo: use str to appease Python 3 (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 (5 lines)

Diff 13516

mercurial/statichttprepo.py

from .i18n import _ from .i18n import _
from . import ( from . import (
changelog, changelog,
error, error,
localrepo, localrepo,
manifest, manifest,
namespaces, namespaces,
pathutil, pathutil,
pycompat,
url, url,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
return self return self
def __exit__(self, exc_type, exc_value, traceback): def __exit__(self, exc_type, exc_value, traceback):
self.close() self.close()
def seek(self, pos): def seek(self, pos):
self.pos = pos self.pos = pos
def read(self, bytes=None): def read(self, bytes=None):
req = urlreq.request(self.url) req = urlreq.request(pycompat.strurl(self.url))
end = '' end = ''
if bytes: if bytes:
end = self.pos + bytes - 1 end = self.pos + bytes - 1
if self.pos or end: if self.pos or end:
req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) req.add_header(r'Range', r'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) raise IOError(num, inst)