diff options
author | Matthew Waters <matthew@centricular.com> | 2020-05-01 18:58:30 +1000 |
---|---|---|
committer | Matthew Waters <ystreet00@gmail.com> | 2020-05-06 06:01:57 +0000 |
commit | 7445fc492835a07fb719e6861f3b0502dce8aed6 (patch) | |
tree | 50293c1e7ad0e2a24bcdc3ec4f84d2d45043469d | |
parent | 3a86a37c03c9701061abe551ac1d9fb2e38dd610 (diff) |
signalling/server: python 3.8 asyncio has it's own TimeoutError
-rwxr-xr-x | webrtc/signalling/simple_server.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webrtc/signalling/simple_server.py b/webrtc/signalling/simple_server.py index ead3034..7da614b 100755 --- a/webrtc/signalling/simple_server.py +++ b/webrtc/signalling/simple_server.py @@ -15,8 +15,7 @@ import asyncio import websockets import argparse import http - -from concurrent.futures._base import TimeoutError +import concurrent class WebRTCSimpleServer(object): @@ -58,7 +57,7 @@ class WebRTCSimpleServer(object): while msg is None: try: msg = await asyncio.wait_for(ws.recv(), self.keepalive_timeout) - except TimeoutError: + except (asyncio.exceptions.TimeoutError, concurrent.futures._base.TimeoutError): print('Sending keepalive ping to {!r} in recv'.format(raddr)) await ws.ping() return msg |