bytes is a reserved keyword

Author: EvaSDK

fluent/event.py

@@ -3,8 +3,7 @@
 
 class Event(object):
     def __init__(self, label, data, **kwargs):
-        if not isinstance(data, dict) :
-            raise Exception("data must be dict")
+        assert isinstance(data, dict), 'data must be a dict'
         s = kwargs.get('sender', sender.get_global_sender())
         timestamp = kwargs.get('time', int(time.time()))
         s.emit_with_time(label, timestamp, data)

fluent/handler.py

@@ -36,7 +36,7 @@ def _structuring(self, data, msg):
         elif isinstance(msg, str):
             try:
                 self._add_dic(data, json.loads(str(msg)))
-            except:
+            except (ValueError, json.JSONDecodeError):
                 pass
 
     def _add_dic(self, data, dic):

fluent/sender.py

@@ -39,7 +39,7 @@ def __init__(self,
 
         try:
             self._reconnect()
-        except:
+        except Exception:
             # will be retried in emit()
             self._close()
 
@@ -48,8 +48,8 @@ def emit(self, label, data):
         self.emit_with_time(label, cur_time, data)
 
     def emit_with_time(self, label, timestamp, data):
-        bytes = self._make_packet(label, timestamp, data)
-        self._send(bytes)
+        bytes_ = self._make_packet(label, timestamp, data)
+        self._send(bytes_)
 
     def _make_packet(self, label, timestamp, data):
         if label:
@@ -61,25 +61,25 @@ def _make_packet(self, label, timestamp, data):
             print(packet)
         return self.packer.pack(packet)
 
-    def _send(self, bytes):
+    def _send(self, bytes_):
         self.lock.acquire()
         try:
-            self._send_internal(bytes)
+            self._send_internal(bytes_)
         finally:
             self.lock.release()
 
-    def _send_internal(self, bytes):
+    def _send_internal(self, bytes_):
         # buffering
         if self.pendings:
-            self.pendings += bytes
-            bytes = self.pendings
+            self.pendings += bytes_
+            bytes_ = self.pendings
 
         try:
             # reconnect if possible
             self._reconnect()
 
             # send message
-            self.socket.sendall(bytes)
+            self.socket.sendall(bytes_)
 
             # send finished
             self.pendings = None
@@ -91,7 +91,7 @@ def _send_internal(self, bytes):
                 # TODO: add callback handler here
                 self.pendings = None
             else:
-                self.pendings = bytes
+                self.pendings = bytes_
 
     def _reconnect(self):
         if not self.socket: