A few changes from:

python-diamond#615

Author: pedmon

src/diamond/handler/graphite.py

@@ -128,6 +128,7 @@ def _send_data(self, data):
         Try to send all data in buffer.
         """
         try:
+            str.encode(data)
             self.socket.sendall(data)
             self._reset_errors()
         except:
@@ -136,6 +137,7 @@ def _send_data(self, data):
                                  "trying reconnect.")
             self._connect()
             try:
+                str.encode(data)
                 self.socket.sendall(data)
             except:
                 return

src/diamond/handler/queue.py

@@ -6,7 +6,7 @@
 """
 
 from . Handler import Handler
-import Queue
+import queue
 
 
 class QueueHandler(Handler):
@@ -34,7 +34,7 @@ def _process(self, metric):
         """
         try:
             self.queue.put(metric, block=False)
-        except Queue.Full:
+        except queue.Full:
             self._throttle_error('Queue full, check handlers for delays')
 
     def flush(self):
@@ -48,5 +48,5 @@ def _flush(self):
         # Send a None down the queue to indicate a flush
         try:
             self.queue.put(None, block=False)
-        except Queue.Full:
+        except queue.Full:
             self._throttle_error('Queue full, check handlers for delays')

src/diamond/utils/classes.py

@@ -121,7 +121,6 @@ def load_collectors_from_paths(paths):
 
     if isinstance(paths, str):
         paths = paths.split(',')
-        paths = map(str.strip, paths)
 
     load_include_path(paths)