Merge pull request #104 from tvincentNuoDB/master

Updated putOpaque to avoid bytes typing

Author: tvincentNuoDB

pynuodb/encodedsession.py

@@ -445,12 +445,12 @@ def putOpaque(self, value):
         """Appends an Opaque data value to the message."""
         data = value.string
         length = len(data)
+        if systemVersion is '3' and type(value) is bytes:
+            data = data.decode('latin-1')
         if length < 40:
             packed = chr(protocol.OPAQUELEN0 + length) + data
         else:
             lengthStr = toByteString(length)
-            if systemVersion is '3':
-                data = data.decode('latin-1')
             packed = chr(protocol.OPAQUECOUNT1 - 1 + len(lengthStr)) + lengthStr + data
         self.__output += packed
         return self

pynuodb/entity.py

@@ -142,7 +142,8 @@ def find_peer(self, address, port=None):
         inet_sock_addr = ":".join([ip, str(port)])
         try:
             return self.__peers_by_addr[inet_sock_addr]
-        except:
+        except Exception as exception:
+            print(exception.message)
             pass
 
         session = Session(address, port=port, service="Identity")
@@ -156,7 +157,8 @@ def find_peer(self, address, port=None):
             if peer:
                 self.__peers_by_addr[peer._get_normalized_addr()] = peer
             return peer
-        except:
+        except Exception as exception:
+            print(exception.message)
             return None
 
     def get_peer(self, agent_id):
@@ -746,7 +748,8 @@ def _remove_process(self, process):
         """
         try:
             del self.__processes[process.pid]
-        except:
+        except Exception as exception:
+            print(exception.message)
             pass
 
     def _get_normalized_addr(self):
@@ -1222,7 +1225,7 @@ def requirements(self):
         return self._requirements
 
 
-class Description:
+class Description(object):
     success_message = "Success"
 
     @staticmethod