From 0956bd4966647ed3914ce8fed59da5eaf7a9cd39 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 9 Sep 2014 16:28:59 +0200
Subject: [PATCH] fix localnodes

---
 oml/localnodes.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/oml/localnodes.py b/oml/localnodes.py
index 508f8fe..5af17ce 100644
--- a/oml/localnodes.py
+++ b/oml/localnodes.py
@@ -74,12 +74,11 @@ class LocalNodesBase(Thread):
         while self._active:
             try:
                 s = self.get_socket()
-                s.settimeout(2)
                 s.bind(('', self._PORT))
                 while self._active:
                     data, addr = s.recvfrom(1024)
                     if self._active:
-                        while data[-1] == '\0':
+                        while data[-1] == 0:
                             data = data[:-1] # Strip trailing \0's
                         data = self.verify(data)
                         if data:
@@ -97,7 +96,7 @@ class LocalNodesBase(Thread):
 
     def verify(self, data):
         try:
-            packet = json.loads(data)
+            packet = json.loads(data.decode())
         except:
             return None
         if len(packet) == 3:
@@ -149,7 +148,7 @@ class LocalNodesBase(Thread):
         if self._socket:
             try:
                 self._socket.shutdown(socket.SHUT_RDWR)
-            except:
+            except OSError:
                 pass
             self._socket.close()
         return Thread.join(self)