This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4599

keepalive: work around slight deficiency in vcr
ClosedPublic

Authored by durin42 on Sep 15 2018, 1:23 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6d094259d9c: keepalive: work around slight deficiency in vcr
Summary

VCR's response type doesn't define the will_close attribute. Let's
just have keepalive default to closing the socket if the will_close
attribute is missing.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/keepalive.py (6 lines)

Diff 11088

mercurial/keepalive.py

# The string form of BadStatusLine is the status line. Add some context # The string form of BadStatusLine is the status line. Add some context
# to make the error message slightly more useful. # to make the error message slightly more useful.
except httplib.BadStatusLine as err: except httplib.BadStatusLine as err:
raise urlerr.urlerror( raise urlerr.urlerror(
_('bad HTTP status line: %s') % pycompat.sysbytes(err.line)) _('bad HTTP status line: %s') % pycompat.sysbytes(err.line))
except (socket.error, httplib.HTTPException) as err: except (socket.error, httplib.HTTPException) as err:
raise urlerr.urlerror(err) raise urlerr.urlerror(err)
# if not a persistent connection, don't try to reuse it # If not a persistent connection, don't try to reuse it. Look
if r.will_close: # for this using getattr() since vcr doesn't define this
# attribute, and in that case always close the connection.
if getattr(r, r'will_close', True):
self._cm.remove(h) self._cm.remove(h)
if DEBUG: if DEBUG:
DEBUG.info("STATUS: %s, %s", r.status, r.reason) DEBUG.info("STATUS: %s, %s", r.status, r.reason)
r._handler = self r._handler = self
r._host = host r._host = host
r._url = req.get_full_url() r._url = req.get_full_url()
r._connection = h r._connection = h