From 1f5669eaaaa37b6fcd32802474a375701a43858f Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Wed, 26 Apr 2017 15:28:09 +0100
Subject: [PATCH 1/5] 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'
     ]
 )

From 2f52d220e324d2a8deb494c1157266ed9df7b1ce Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Wed, 26 Apr 2017 15:28:32 +0100
Subject: [PATCH 2/5] version bump

---
 m2mclient/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m2mclient/_version.py b/m2mclient/_version.py
index c0ec056..21bf0c5 100644
--- a/m2mclient/_version.py
+++ b/m2mclient/_version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-VERSION = "0.1.7"
+VERSION = "0.1.8a0"

From 7cfe7be6f95fafe607b76010c4974c380bb9afbe Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Wed, 26 Apr 2017 17:01:43 +0100
Subject: [PATCH 3/5] log errors in thread

---
 m2mclient/_version.py | 2 +-
 m2mclient/client.py   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/m2mclient/_version.py b/m2mclient/_version.py
index 21bf0c5..39d8643 100644
--- a/m2mclient/_version.py
+++ b/m2mclient/_version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-VERSION = "0.1.8a0"
+VERSION = "0.1.8a1"
diff --git a/m2mclient/client.py b/m2mclient/client.py
index e8fc634..db85661 100644
--- a/m2mclient/client.py
+++ b/m2mclient/client.py
@@ -50,6 +50,8 @@ def run(self):
                         self.ready_event.set()
                     elif event.name == 'binary':
                         self.on_binary(event.data)
+        except Exception as errror:
+            log.exception('error in m2m thread')
         finally:
             self.running = False
             self.ready_event.set()

From 824aed4d10c39f2a7a1bcb4b20e93e2ae52562d4 Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Mon, 22 May 2017 17:29:23 +0100
Subject: [PATCH 4/5] Update _version.py

---
 m2mclient/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m2mclient/_version.py b/m2mclient/_version.py
index 39d8643..db3f643 100644
--- a/m2mclient/_version.py
+++ b/m2mclient/_version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-VERSION = "0.1.8a1"
+VERSION = "0.1.8"

From 9073ef161a4ef131dd37450c34cee1bfed20e91c Mon Sep 17 00:00:00 2001
From: Will McGugan <willmcgugan@gmail.com>
Date: Mon, 22 May 2017 17:35:40 +0100
Subject: [PATCH 5/5] unused error

---
 m2mclient/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m2mclient/client.py b/m2mclient/client.py
index db85661..c5f76e5 100644
--- a/m2mclient/client.py
+++ b/m2mclient/client.py
@@ -50,7 +50,7 @@ def run(self):
                         self.ready_event.set()
                     elif event.name == 'binary':
                         self.on_binary(event.data)
-        except Exception as errror:
+        except Exception:
             log.exception('error in m2m thread')
         finally:
             self.running = False