Backport fix for juju#989

mthaddon · Mar 21, 2024 · ebf7e17 · ebf7e17
1 parent 2b8c252
commit ebf7e17
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/juju/client/connection.py b/juju/client/connection.py
@@ -447,7 +447,9 @@ async def close(self, to_reconnect=False):
 
     async def _recv(self, request_id):
         if not self.is_open:
-            raise websockets.exceptions.ConnectionClosed(0, 'websocket closed')
+            raise websockets.exceptions.ConnectionClosed(
+                    websockets.frames.Close(websockets.frames.CloseCode.NORMAL_CLOSURE,
+                                            'websocket closed'))
         try:
             return await self.messages.get(request_id)
         except GeneratorExit:
@@ -615,7 +617,8 @@ async def rpc(self, msg, encoder=None):
             if self.monitor.status == Monitor.DISCONNECTED:
                 # closed cleanly; shouldn't try to reconnect
                 raise websockets.exceptions.ConnectionClosed(
-                    0, 'websocket closed')
+                    websockets.frames.Close(websockets.frames.CloseCode.NORMAL_CLOSURE,
+                                            'websocket closed'))
             try:
                 await self._ws.send(outgoing)
                 break