Skip to content

Commit 7fb869a

Browse files
leszekhanuszleszekhanusz
committed
Renaming TransportConnectionClosed to TransportConnectionFailed
1 parent 750e695 commit 7fb869a

19 files changed

+64
-64
lines changed

‎gql/transport/common/adapters/aiohttp.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from aiohttp.typedefs import LooseHeaders, StrOrURL
99
from multidict import CIMultiDictProxy
1010

11-
from ...exceptions import TransportConnectionClosed, TransportProtocolError
11+
from ...exceptions import TransportConnectionFailed, TransportProtocolError
1212
from ..aiohttp_closed_event import create_aiohttp_closed_event
1313
from .connection import AdapterConnection
1414

@@ -160,7 +160,7 @@ async def connect(self) -> None:
160160
**connect_args,
161161
)
162162
except Exception as e:
163-
raise TransportConnectionClosed("Connect failed") from e
163+
raise TransportConnectionFailed("Connect failed") from e
164164

165165
self._response_headers = self.websocket._response.headers
166166

@@ -171,15 +171,15 @@ async def send(self, message: str) -> None:
171171
message: String message to send
172172
173173
Raises:
174-
TransportConnectionClosed: If connection closed
174+
TransportConnectionFailed: If connection closed
175175
"""
176176
if self.websocket is None:
177-
raise TransportConnectionClosed("Connection is already closed")
177+
raise TransportConnectionFailed("Connection is already closed")
178178

179179
try:
180180
await self.websocket.send_str(message)
181181
except ConnectionResetError as e:
182-
raise TransportConnectionClosed("Connection was closed") from e
182+
raise TransportConnectionFailed("Connection was closed") from e
183183

184184
async def receive(self) -> str:
185185
"""Receive message from the WebSocket server.
@@ -188,12 +188,12 @@ async def receive(self) -> str:
188188
String message received
189189
190190
Raises:
191-
TransportConnectionClosed: If connection closed
191+
TransportConnectionFailed: If connection closed
192192
TransportProtocolError: If protocol error or binary data received
193193
"""
194194
# It is possible that the websocket has been already closed in another task
195195
if self.websocket is None:
196-
raise TransportConnectionClosed("Connection is already closed")
196+
raise TransportConnectionFailed("Connection is already closed")
197197

198198
while True:
199199
ws_message = await self.websocket.receive()
@@ -208,7 +208,7 @@ async def receive(self) -> str:
208208
WSMsgType.CLOSING,
209209
WSMsgType.ERROR,
210210
):
211-
raise TransportConnectionClosed("Connection was closed")
211+
raise TransportConnectionFailed("Connection was closed")
212212
elif ws_message.type is WSMsgType.BINARY:
213213
raise TransportProtocolError("Binary data received in the websocket")
214214

‎gql/transport/common/adapters/connection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async def send(self, message: str) -> None:
3535
message: String message to send
3636
3737
Raises:
38-
TransportConnectionClosed: If connection closed
38+
TransportConnectionFailed: If connection closed
3939
"""
4040
pass # pragma: no cover
4141

@@ -47,7 +47,7 @@ async def receive(self) -> str:
4747
String message received
4848
4949
Raises:
50-
TransportConnectionClosed: If connection closed
50+
TransportConnectionFailed: If connection closed
5151
TransportProtocolError: If protocol error or binary data received
5252
"""
5353
pass # pragma: no cover

‎gql/transport/common/adapters/websockets.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from websockets.client import WebSocketClientProtocol
77
from websockets.datastructures import Headers, HeadersLike
88

9-
from ...exceptions import TransportConnectionClosed, TransportProtocolError
9+
from ...exceptions import TransportConnectionFailed, TransportProtocolError
1010
from .connection import AdapterConnection
1111

1212
log = logging.getLogger("gql.transport.common.adapters.websockets")
@@ -70,7 +70,7 @@ async def connect(self) -> None:
7070
try:
7171
self.websocket = await websockets.client.connect(self.url, **connect_args)
7272
except Exception as e:
73-
raise TransportConnectionClosed("Connect failed") from e
73+
raise TransportConnectionFailed("Connect failed") from e
7474

7575
self._response_headers = self.websocket.response_headers
7676

@@ -81,15 +81,15 @@ async def send(self, message: str) -> None:
8181
message: String message to send
8282
8383
Raises:
84-
TransportConnectionClosed: If connection closed
84+
TransportConnectionFailed: If connection closed
8585
"""
8686
if self.websocket is None:
87-
raise TransportConnectionClosed("Connection is already closed")
87+
raise TransportConnectionFailed("Connection is already closed")
8888

8989
try:
9090
await self.websocket.send(message)
9191
except Exception as e:
92-
raise TransportConnectionClosed("Connection was closed") from e
92+
raise TransportConnectionFailed("Connection was closed") from e
9393

9494
async def receive(self) -> str:
9595
"""Receive message from the WebSocket server.
@@ -98,18 +98,18 @@ async def receive(self) -> str:
9898
String message received
9999
100100
Raises:
101-
TransportConnectionClosed: If connection closed
101+
TransportConnectionFailed: If connection closed
102102
TransportProtocolError: If protocol error or binary data received
103103
"""
104104
# It is possible that the websocket has been already closed in another task
105105
if self.websocket is None:
106-
raise TransportConnectionClosed("Connection is already closed")
106+
raise TransportConnectionFailed("Connection is already closed")
107107

108108
# Wait for the next websocket frame. Can raise ConnectionClosed
109109
try:
110110
data = await self.websocket.recv()
111111
except Exception as e:
112-
raise TransportConnectionClosed("Connection was closed") from e
112+
raise TransportConnectionFailed("Connection was closed") from e
113113

114114
# websocket.recv() can return either str or bytes
115115
# In our case, we should receive only str here

‎gql/transport/common/base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from ..exceptions import (
1212
TransportAlreadyConnected,
1313
TransportClosed,
14-
TransportConnectionClosed,
14+
TransportConnectionFailed,
1515
TransportProtocolError,
1616
TransportQueryError,
1717
TransportServerError,
@@ -134,7 +134,7 @@ async def _send(self, message: str) -> None:
134134
try:
135135
await self.adapter.send(message)
136136
log.info(">>> %s", message)
137-
except TransportConnectionClosed as e:
137+
except TransportConnectionFailed as e:
138138
await self._fail(e, clean_close=False)
139139
raise e
140140

@@ -146,7 +146,7 @@ async def _receive(self) -> str:
146146
raise TransportClosed("Transport is already closed")
147147

148148
# Wait for the next frame.
149-
# Can raise TransportConnectionClosed or TransportProtocolError
149+
# Can raise TransportConnectionFailed or TransportProtocolError
150150
answer: str = await self.adapter.receive()
151151

152152
log.info("<<< %s", answer)
@@ -211,7 +211,7 @@ async def _receive_data_loop(self) -> None:
211211
# Wait the next answer from the server
212212
try:
213213
answer = await self._receive()
214-
except (TransportConnectionClosed, TransportProtocolError) as e:
214+
except (TransportConnectionFailed, TransportProtocolError) as e:
215215
await self._fail(e, clean_close=False)
216216
break
217217
except TransportClosed:
@@ -296,7 +296,7 @@ async def subscribe(
296296
while True:
297297

298298
# Wait for the answer from the queue of this query_id
299-
# This can raise TransportError or TransportConnectionClosed
299+
# This can raise TransportError or TransportConnectionFailed
300300
answer_type, execution_result = await listener.get()
301301

302302
# If the received answer contains data,
@@ -402,7 +402,7 @@ async def connect(self) -> None:
402402
# if no ACKs are received within the ack_timeout
403403
try:
404404
await self._initialize()
405-
except TransportConnectionClosed as e:
405+
except TransportConnectionFailed as e:
406406
raise e
407407
except (
408408
TransportProtocolError,

‎gql/transport/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class TransportClosed(TransportError):
6161
"""
6262

6363

64-
class TransportConnectionClosed(TransportError):
64+
class TransportConnectionFailed(TransportError):
6565
"""Transport adapter connection closed.
6666
6767
This exception is by the connection adapter code when a connection closed.

‎gql/transport/phoenix_channel_websockets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from .common.adapters.websockets import WebSocketsAdapter
99
from .common.base import SubscriptionTransportBase
1010
from .exceptions import (
11-
TransportConnectionClosed,
11+
TransportConnectionFailed,
1212
TransportProtocolError,
1313
TransportQueryError,
1414
TransportServerError,
@@ -127,7 +127,7 @@ async def heartbeat_coro():
127127
}
128128
)
129129
)
130-
except TransportConnectionClosed: # pragma: no cover
130+
except TransportConnectionFailed: # pragma: no cover
131131
return
132132

133133
self.heartbeat_task = asyncio.ensure_future(heartbeat_coro())

‎gql/transport/websockets_protocol.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from .common.adapters.connection import AdapterConnection
1010
from .common.base import SubscriptionTransportBase
1111
from .exceptions import (
12-
TransportConnectionClosed,
12+
TransportConnectionFailed,
1313
TransportProtocolError,
1414
TransportQueryError,
1515
TransportServerError,
@@ -508,7 +508,7 @@ async def _close_hook(self):
508508
if self.send_ping_task is not None:
509509
log.debug("_close_hook: cancelling send_ping_task")
510510
self.send_ping_task.cancel()
511-
with suppress(asyncio.CancelledError, TransportConnectionClosed):
511+
with suppress(asyncio.CancelledError, TransportConnectionFailed):
512512
log.debug("_close_hook: awaiting send_ping_task")
513513
await self.send_ping_task
514514
self.send_ping_task = None

‎tests/test_aiohttp_websocket_exceptions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from gql import Client, gql
99
from gql.transport.exceptions import (
10-
TransportConnectionClosed,
10+
TransportConnectionFailed,
1111
TransportProtocolError,
1212
TransportQueryError,
1313
)
@@ -289,7 +289,7 @@ async def test_aiohttp_websocket_server_closing_directly(event_loop, server):
289289

290290
sample_transport = AIOHTTPWebsocketsTransport(url=url)
291291

292-
with pytest.raises(TransportConnectionClosed):
292+
with pytest.raises(TransportConnectionFailed):
293293
async with Client(transport=sample_transport):
294294
pass
295295

@@ -309,7 +309,7 @@ async def test_aiohttp_websocket_server_closing_after_ack(
309309

310310
query = gql("query { hello }")
311311

312-
with pytest.raises(TransportConnectionClosed):
312+
with pytest.raises(TransportConnectionFailed):
313313
await session.execute(query)
314314

315315

‎tests/test_aiohttp_websocket_graphqlws_exceptions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from gql import Client, gql
77
from gql.transport.exceptions import (
88
TransportClosed,
9-
TransportConnectionClosed,
9+
TransportConnectionFailed,
1010
TransportProtocolError,
1111
TransportQueryError,
1212
)
@@ -248,7 +248,7 @@ async def test_aiohttp_websocket_graphqlws_server_closing_directly(
248248

249249
transport = AIOHTTPWebsocketsTransport(url=url)
250250

251-
with pytest.raises(TransportConnectionClosed):
251+
with pytest.raises(TransportConnectionFailed):
252252
async with Client(transport=transport):
253253
pass
254254

@@ -268,7 +268,7 @@ async def test_aiohttp_websocket_graphqlws_server_closing_after_ack(
268268

269269
query = gql("query { hello }")
270270

271-
with pytest.raises(TransportConnectionClosed):
271+
with pytest.raises(TransportConnectionFailed):
272272
await session.execute(query)
273273

274274
await session.transport.wait_closed()

‎tests/test_aiohttp_websocket_graphqlws_subscription.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from parse import search
99

1010
from gql import Client, gql
11-
from gql.transport.exceptions import TransportConnectionClosed, TransportServerError
11+
from gql.transport.exceptions import TransportConnectionFailed, TransportServerError
1212

1313
from .conftest import MS, PyPy, WebSocketServerHelper
1414

@@ -394,7 +394,7 @@ async def test_aiohttp_websocket_graphqlws_subscription_server_connection_closed
394394
count = 10
395395
subscription = gql(subscription_str.format(count=count))
396396

397-
with pytest.raises(TransportConnectionClosed):
397+
with pytest.raises(TransportConnectionFailed):
398398
async for result in session.subscribe(subscription):
399399
number = result["number"]
400400
print(f"Number received: {number}")
@@ -843,7 +843,7 @@ async def test_aiohttp_websocket_graphqlws_subscription_reconnecting_session(
843843
print("\nSUBSCRIPTION_1_WITH_DISCONNECT\n")
844844
async for result in session.subscribe(subscription_with_disconnect):
845845
pass
846-
except TransportConnectionClosed:
846+
except TransportConnectionFailed:
847847
pass
848848

849849
await asyncio.sleep(50 * MS)
@@ -861,7 +861,7 @@ async def test_aiohttp_websocket_graphqlws_subscription_reconnecting_session(
861861
generator = session.subscribe(subscription)
862862
async for result in generator:
863863
pass
864-
except (TransportClosed, TransportConnectionClosed):
864+
except (TransportClosed, TransportConnectionFailed):
865865
if generator:
866866
await generator.aclose()
867867
pass

‎tests/test_aiohttp_websocket_query.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from gql.transport.exceptions import (
1010
TransportAlreadyConnected,
1111
TransportClosed,
12-
TransportConnectionClosed,
12+
TransportConnectionFailed,
1313
TransportQueryError,
1414
TransportServerError,
1515
)
@@ -177,7 +177,7 @@ async def test_aiohttp_websocket_using_ssl_connection_self_cert_fail(
177177
if verify_https == "explicitely_enabled":
178178
assert transport.ssl is True
179179

180-
with pytest.raises(TransportConnectionClosed) as exc_info:
180+
with pytest.raises(TransportConnectionFailed) as exc_info:
181181
async with Client(transport=transport) as session:
182182

183183
query1 = gql(query1_str)

‎tests/test_aiohttp_websocket_subscription.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from parse import search
1010

1111
from gql import Client, gql
12-
from gql.transport.exceptions import TransportConnectionClosed, TransportServerError
12+
from gql.transport.exceptions import TransportConnectionFailed, TransportServerError
1313

1414
from .conftest import MS, WebSocketServerHelper
1515
from .starwars.schema import StarWarsIntrospection, StarWarsSchema, StarWarsTypeDef
@@ -385,7 +385,7 @@ async def test_aiohttp_websocket_subscription_server_connection_closed(
385385
count = 10
386386
subscription = gql(subscription_str.format(count=count))
387387

388-
with pytest.raises(TransportConnectionClosed):
388+
with pytest.raises(TransportConnectionFailed):
389389

390390
async for result in session.subscribe(subscription):
391391

@@ -778,7 +778,7 @@ async def test_subscribe_on_closing_transport(event_loop, server, subscription_s
778778
async with client as session:
779779
session.transport.adapter.websocket._writer._closing = True
780780

781-
with pytest.raises(TransportConnectionClosed):
781+
with pytest.raises(TransportConnectionFailed):
782782
async for _ in session.subscribe(subscription):
783783
pass
784784

@@ -801,6 +801,6 @@ async def test_subscribe_on_null_transport(event_loop, server, subscription_str)
801801
async with client as session:
802802

803803
session.transport.adapter.websocket = None
804-
with pytest.raises(TransportConnectionClosed):
804+
with pytest.raises(TransportConnectionFailed):
805805
async for _ in session.subscribe(subscription):
806806
pass

0 commit comments

Comments
 (0)