This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3347

httppeer: work around API differences on urllib Request objects
ClosedPublic

Authored by durin42 on Apr 14 2018, 12:32 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa1f785148097: httppeer: work around API differences on urllib Request objects
Summary

Since this is only a problem in httppeer, I'd rather keep this a
local-to-the-module kludge rather than pile more on pycompat. We'll
still find it easily to clean up later because it checks
pycompat.ispy3.

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

durin42 created this revision.Apr 14 2018, 12:32 AM
indygreg accepted this revision.Apr 16 2018, 7:11 PM
This revision is now accepted and ready to land.Apr 16 2018, 7:11 PM
Closed by commit rHGa1f785148097: httppeer: work around API differences on urllib Request objects (authored by durin42). · Explain WhyApr 16 2018, 7:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (13 lines)

Diff 8341

mercurial/httppeer.py

req = requestbuilder(pycompat.strurl(cu), data, headers) req = requestbuilder(pycompat.strurl(cu), data, headers)
if data is not None: if data is not None:
ui.debug("sending %d bytes\n" % size) ui.debug("sending %d bytes\n" % size)
req.add_unredirected_header(r'Content-Length', r'%d' % size) req.add_unredirected_header(r'Content-Length', r'%d' % size)
return req, cu, qs return req, cu, qs
def _reqdata(req):
"""Get request data, if any. If no data, returns None."""
if pycompat.ispy3:
return req.data
if not req.has_data():
return None
return req.get_data()
def sendrequest(ui, opener, req): def sendrequest(ui, opener, req):
"""Send a prepared HTTP request. """Send a prepared HTTP request.
Returns the response object. Returns the response object.
""" """
if (ui.debugflag if (ui.debugflag
and ui.configbool('devel', 'debug.peer-request')): and ui.configbool('devel', 'debug.peer-request')):
dbg = ui.debug dbg = ui.debug
hgargssize = 0 hgargssize = 0
hgargssize += len(value) hgargssize += len(value)
else: else:
dbg(line % ' %s %s' % (header, value)) dbg(line % ' %s %s' % (header, value))
if hgargssize is not None: if hgargssize is not None:
dbg(line % ' %d bytes of commands arguments in headers' dbg(line % ' %d bytes of commands arguments in headers'
% hgargssize) % hgargssize)
data = _reqdata(req)
if req.has_data(): if data is not None:
data = req.get_data()
length = getattr(data, 'length', None) length = getattr(data, 'length', None)
if length is None: if length is None:
length = len(data) length = len(data)
dbg(line % ' %d bytes of data' % length) dbg(line % ' %d bytes of data' % length)
start = util.timer() start = util.timer()
try: try: