This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5950

url: always access req._tunnel_host
ClosedPublic

Authored by indygreg on Feb 12 2019, 5:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd20f1594ff4a: url: always access req._tunnel_host
Summary

The getattr() was there to handle Python versions before 2.6, which
lacked this attribute.

We /might/ be able to further delete some code here. However, the
behavior here is extremely hard to follow because large parts of
this code duplicate code from the Python standard library and it
is difficult to understand what is actually needed.

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.Feb 12 2019, 5:37 PM
Closed by commit rHGd20f1594ff4a: url: always access req._tunnel_host (authored by indygreg). · Explain WhyFeb 15 2019, 10:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/url.py (6 lines)

Diff 14118

mercurial/url.py

proxyres = getattr(self, 'proxyres', None) proxyres = getattr(self, 'proxyres', None)
if proxyres: if proxyres:
if proxyres.will_close: if proxyres.will_close:
self.close() self.close()
self.proxyres = None self.proxyres = None
return proxyres return proxyres
return keepalive.HTTPConnection.getresponse(self) return keepalive.HTTPConnection.getresponse(self)
# general transaction handler to support different ways to handle # Large parts of this function have their origin from before Python 2.6
# HTTPS proxying before and after Python 2.6.3. # and could potentially be removed.
def _generic_start_transaction(handler, h, req): def _generic_start_transaction(handler, h, req):
tunnel_host = getattr(req, '_tunnel_host', None) tunnel_host = req._tunnel_host
if tunnel_host: if tunnel_host:
if tunnel_host[:7] not in ['http://', 'https:/']: if tunnel_host[:7] not in ['http://', 'https:/']:
tunnel_host = 'https://' + tunnel_host tunnel_host = 'https://' + tunnel_host
new_tunnel = True new_tunnel = True
else: else:
tunnel_host = urllibcompat.getselector(req) tunnel_host = urllibcompat.getselector(req)
new_tunnel = False new_tunnel = False