Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keepalive: work around slight deficiency in vcr
authorAugie Fackler <raf@durin42.com>
Sat, 15 Sep 2018 00:19:09 -0400
changeset 39649 d6d094259d9c
parent 39648 e37a0fcd82c0
child 39650 d8f07b16abfc
keepalive: work around slight deficiency in vcr 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. Differential Revision: https://phab.mercurial-scm.org/D4599
mercurial/keepalive.py file | annotate | diff | comparison | revisions 
--- a/mercurial/keepalive.py	Sat Sep 15 00:18:16 2018 -0400
+++ b/mercurial/keepalive.py	Sat Sep 15 00:19:09 2018 -0400
@@ -247,8 +247,10 @@
         except (socket.error, httplib.HTTPException) as err:
             raise urlerr.urlerror(err)
 
-        # if not a persistent connection, don't try to reuse it
-        if r.will_close:
+        # If not a persistent connection, don't try to reuse it. Look
+        # 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)
 
         if DEBUG:
mercurial