From 1f5669eaaaa37b6fcd32802474a375701a43858f Mon Sep 17 00:00:00 2001 From: Will McGugan Date: Wed, 26 Apr 2017 15:28:09 +0100 Subject: [PATCH] auto close socket --- m2mclient/client.py | 23 ++++++++++++----------- setup.py | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/m2mclient/client.py b/m2mclient/client.py index 373e9ab..e8fc634 100644 --- a/m2mclient/client.py +++ b/m2mclient/client.py @@ -37,18 +37,19 @@ def client(self): def run(self): """Main thread loop.""" try: - for event in self.ws: - if event.name == 'rejected': - self.error = event.reason - elif event.name == 'disconnected': - if not event.graceful: + with self.ws: + for event in self.ws: + if event.name == 'rejected': self.error = event.reason - elif event.name == 'ready': - self.running = True - self.on_startup() - self.ready_event.set() - elif event.name == 'binary': - self.on_binary(event.data) + elif event.name == 'disconnected': + if not event.graceful: + self.error = event.reason + elif event.name == 'ready': + self.running = True + self.on_startup() + self.ready_event.set() + elif event.name == 'binary': + self.on_binary(event.data) finally: self.running = False self.ready_event.set() diff --git a/setup.py b/setup.py index 38a3547..66c4c73 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ exclude_package_data={'': ['_*', 'docs/*']}, classifiers=classifiers, install_requires=[ - 'lomond==0.1.6', + 'lomond==0.1.7a0', 'wsaccel==0.6.2' ] )