Python 3 fixes

.travis.yml

@@ -5,6 +5,7 @@ python: 2.7
 env:
 - TOXENV=py27
 - TOXENV=py34
+- TOXENV=py35
 - TOXENV=cov
 - TOXENV=pylint
 - TOXENV=pep8

graphite_beacon/alerts.py

@@ -270,7 +270,7 @@ def load(self):
                                                    connect_timeout=self.connect_timeout,
                                                    validate_cert=self.validate_cert)
                 records = (
-                    GraphiteRecord(line, self.default_nan_value, self.ignore_nan)
+                    GraphiteRecord(line.decode('utf8'), self.default_nan_value, self.ignore_nan)
                     for line in response.buffer)
                 data = [
                     (None if record.empty else getattr(record, self.method), record.target)

graphite_beacon/handlers/__init__.py

@@ -45,7 +45,8 @@ def __init__(self, reactor):
     def get_short(self, level, alert, value, target=None, ntype=None, rule=None):  # pylint: disable=unused-argument
         tmpl = TEMPLATES[ntype]['short']
         return tmpl.generate(
-            level=level, reactor=self.reactor, alert=alert, value=value, target=target).strip()
+            level=level, reactor=self.reactor, alert=alert, value=value,
+            target=target).decode().strip()
 
     def init_handler(self):
         """ Init configuration here."""

graphite_beacon/handlers/slack.py

@@ -38,7 +38,8 @@ def get_message(self, level, alert, value, target=None, ntype=None, rule=None):
         msg_type = 'slack' if ntype == 'graphite' else 'short'
         tmpl = TEMPLATES[ntype][msg_type]
         return tmpl.generate(
-            level=level, reactor=self.reactor, alert=alert, value=value, target=target).strip()
+            level=level, reactor=self.reactor, alert=alert,
+            value=value, target=target).decode().strip()
 
     @gen.coroutine
     def notify(self, level, *args, **kwargs):

graphite_beacon/handlers/smtp.py

@@ -64,11 +64,11 @@ def get_message(self, level, alert, value, target=None, ntype=None, rule=None):
             reactor=self.reactor, alert=alert, value=value, level=level, target=target,
             dt=dt, rule=rule, **self.options)
         msg = MIMEMultipart('alternative')
-        plain = MIMEText(str(txt_tmpl.generate(**ctx)), 'plain')
+        plain = MIMEText(txt_tmpl.generate(**ctx).decode('utf8'), 'plain')
         msg.attach(plain)
         if self.options['html']:
             html_tmpl = TEMPLATES[ntype]['html']
-            html = MIMEText(str(html_tmpl.generate(**ctx)), 'html')
+            html = MIMEText(html_tmpl.generate(**ctx).decode('utf8'), 'html')
             msg.attach(html)
         return msg
 

tests/integration/graphite_test.py

@@ -7,7 +7,7 @@
 
 from graphite_beacon.alerts import GraphiteAlert
 from graphite_beacon.core import Reactor
-from graphite_beacon._compat import StringIO
+from io import BytesIO
 
 from ..util import build_graphite_response
 
@@ -47,8 +47,9 @@ def test_graphite(self, mock_smpt_notify, mock_fetch):
         assert isinstance(alert, GraphiteAlert)
 
         metric_data = [5, 7, 9]
+        payload = build_graphite_response(data=metric_data).encode('utf8')
         build_resp = lambda: HTTPResponse(HTTPRequest('http://localhost:80/graphite'), 200,
-                                          buffer=StringIO(build_graphite_response(data=metric_data)))
+                                          buffer=BytesIO(payload))
 
         mock_fetch.side_effect = iter(tornado.gen.maybe_future(build_resp())
                                       for _ in range(10))

tests/unit/handlers/smtp_test.py

@@ -13,7 +13,7 @@ def test_html_template(reactor):
 
     message = smtp.get_message(
         'critical', galert, 3000000, target=target, ntype='graphite', rule=galert.rules[0])
-    assert message
+    assert message.as_string()
 
     assert len(message._payload) == 2
     text, html = message._payload
@@ -22,7 +22,7 @@ def test_html_template(reactor):
     ualert = BaseAlert.get(
         reactor, source='url', name='Test', query='http://google.com', rules=["critical: != 200"])
     message = smtp.get_message('critical', ualert, '3000000', target, 'url')
-    assert message
+    assert message.as_string()
 
     assert len(message._payload) == 2
     _, html = message._payload
@@ -31,6 +31,6 @@ def test_html_template(reactor):
     ealert = BaseAlert.get(reactor, name='Test', query='*', rules=["critical: > 5 AND < 10"])
     message = smtp.get_message(
         'critical', ealert, 8, target=target, ntype='graphite', rule=ealert.rules[0])
-    assert message
+    assert message.as_string()
 
     assert len(message._payload) == 2

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py34,cov,pylint,pep8
+envlist=py27,py34,py35,cov,pylint,pep8
 
 [testenv]
 commands=py.test tests