From 2ca3dac1db157a08db66af82c9cf0893080019d3 Mon Sep 17 00:00:00 2001 From: Pablo Lefort Date: Thu, 5 Jan 2017 16:11:44 -0300 Subject: [PATCH 1/3] Python 3 support fix on _send method --- graphitesend/graphitesend.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/graphitesend/graphitesend.py b/graphitesend/graphitesend.py index 4b3d24b..214d11f 100644 --- a/graphitesend/graphitesend.py +++ b/graphitesend/graphitesend.py @@ -381,6 +381,9 @@ def _send(self, message): """ Given a message send it to the graphite server. """ + # Python 3 support + if type(message) == bytes: + message = str(message, 'utf-8') self.socket.sendall(message.encode("ascii")) From 8d3cba27662395ebd2a89f45389fc684b5632c1f Mon Sep 17 00:00:00 2001 From: Pablo Lefort Date: Fri, 6 Jan 2017 12:27:39 -0300 Subject: [PATCH 2/3] Fix backwards with Python 2.x --- graphitesend/graphitesend.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/graphitesend/graphitesend.py b/graphitesend/graphitesend.py index 214d11f..38e1d67 100644 --- a/graphitesend/graphitesend.py +++ b/graphitesend/graphitesend.py @@ -10,6 +10,7 @@ import pickle import socket import struct +import sys import time import random @@ -382,8 +383,9 @@ def _send(self, message): Given a message send it to the graphite server. """ # Python 3 support - if type(message) == bytes: - message = str(message, 'utf-8') + if sys.version_info >= (3, 0): + if type(message) == bytes: + message = str(message, 'utf-8') self.socket.sendall(message.encode("ascii")) From 961cfc65a251f69b4ed8f42450af288b656ab68d Mon Sep 17 00:00:00 2001 From: Pablo Lefort Date: Sat, 7 Jan 2017 11:47:43 -0300 Subject: [PATCH 3/3] Update fix for py3 support --- graphitesend/graphitesend.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/graphitesend/graphitesend.py b/graphitesend/graphitesend.py index 7e09668..a0ec882 100644 --- a/graphitesend/graphitesend.py +++ b/graphitesend/graphitesend.py @@ -288,9 +288,8 @@ def _send(self, message): Given a message send it to the graphite server. """ # Python 3 support - if sys.version_info >= (3, 0): - if type(message) == bytes: - message = str(message, 'utf-8') + if sys.version_info >= (3, 0) and type(message) == bytes: + message = str(message, 'utf-8') self.socket.sendall(message.encode("ascii"))