Skip to content

Allow python3 encode/decodes #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daubers wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow python3 encode/decodes #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc0331
Try and allow python3 encode/decodes
daubers Dec 19, 2016
0a4fb00
Merge branch 'master' into py3encodes
Shir0kamii Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions graphitesend/graphitesend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,18 @@ def _handle_send_error(self, error):
(self.addr, error)
)

def _ascii_encode(self, message):
if type(message) == bytes:
return message.decode('ascii')
else:
return message.encode('ascii')

def _send(self, message):
"""
Given a message send it to the graphite server.
"""

self.socket.sendall(message.encode("ascii"))
self.socket.sendall(self._ascii_encode(message))

def _send_and_reconnect(self, message):
"""Send _message_ to Graphite Server and attempt reconnect on failure.
Expand All @@ -394,12 +400,12 @@ def _send_and_reconnect(self, message):
:raises socket.error: When the socket connection is no longer valid.
"""
try:
self.socket.sendall(message.encode("ascii"))
self.socket.sendall(self._ascii_encode(message))
except (AttributeError, socket.error):
if not self.autoreconnect():
raise
else:
self.socket.sendall(message.encode("ascii"))
self.socket.sendall(self._ascii_encode(message))

def _presend(self, message):
"""
Expand Down