changeset 197:6949fc164439 2.5

hgclient: look for an open server before closing it in ResponseError block At least some of the codepaths that can throw a ResponseError close the server first (the one in _readchannel does so in order to detect server startup failures, for example), so we have to verify we have a server to close before doing so, otherwise we can lose the ResponseError and the user sees an AttributeError when we try to use .close() on a NoneType.
author Augie Fackler <raf@durin42.com>
date Sun, 10 Dec 2017 12:52:37 -0500
parents c586d02f7cda
children 79a19cf1528e
files hglib/client.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hglib/client.py	Sun Dec 10 12:50:57 2017 -0500
+++ b/hglib/client.py	Sun Dec 10 12:52:37 2017 -0500
@@ -271,7 +271,8 @@
         try:
             self._readhello()
         except error.ResponseError:
-            self.close()
+            if self.server is not None:
+                self._close()
             raise
         except error.ServerError:
             if self.server is None: