diff options
| author | Ben Burry <bburry@etsy.com> | 2015-11-26 08:49:52 +0000 |
|---|---|---|
| committer | Ben Burry <bburry@etsy.com> | 2015-11-26 08:49:52 +0000 |
| commit | 0fa9424267c3f2c9d77da834680116d2e72d0d00 (patch) | |
| tree | 6df0da3e266f174e0da1a80bf48db2c51afe9ca3 | |
| parent | b231a7957b9c8aef90919819a4dc61c0aeef2b11 (diff) | |
| download | logster-0fa9424267c3f2c9d77da834680116d2e72d0d00.zip logster-0fa9424267c3f2c9d77da834680116d2e72d0d00.tar.gz logster-0fa9424267c3f2c9d77da834680116d2e72d0d00.tar.bz2 | |
Remove python 2.x-incompatible use of bytes()
Fixes #94
| -rw-r--r-- | logster/outputs/cloudwatch.py | 2 | ||||
| -rw-r--r-- | logster/outputs/graphite.py | 2 | ||||
| -rw-r--r-- | logster/outputs/statsd.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/logster/outputs/cloudwatch.py b/logster/outputs/cloudwatch.py index e83ccaf..18c8468 100644 --- a/logster/outputs/cloudwatch.py +++ b/logster/outputs/cloudwatch.py @@ -83,7 +83,7 @@ class CloudWatch(object): else: signature = hmac.new( key=bytes(self.secret_key), msg=bytes(string_to_sign), digestmod=hashlib.sha256).digest() except TypeError: - signature = hmac.new( key=bytes(self.secret_key, "utf-8"), msg=bytes(string_to_sign, "utf-8"), digestmod=hashlib.sha256).digest() + signature = hmac.new( key=self.secret_key.encode("utf-8"), msg=string_to_sign.encode("utf-8"), digestmod=hashlib.sha256).digest() signature = base64.encodestring(signature).strip() urlencoded_signature = quote_plus(signature) diff --git a/logster/outputs/graphite.py b/logster/outputs/graphite.py index c2ff501..a8632fa 100644 --- a/logster/outputs/graphite.py +++ b/logster/outputs/graphite.py @@ -49,7 +49,7 @@ class GraphiteOutput(LogsterOutput): self.logger.debug("Submitting Graphite metric: %s" % metric_string) if (not self.dry_run): - s.sendall(bytes("%s\n" % metric_string, 'ascii')) + s.sendall(("%s\n" % metric_string).encode('ascii')) else: print("%s %s" % (self.graphite_host, metric_string)) finally: diff --git a/logster/outputs/statsd.py b/logster/outputs/statsd.py index 64cd2f8..3243133 100644 --- a/logster/outputs/statsd.py +++ b/logster/outputs/statsd.py @@ -31,6 +31,6 @@ class StatsdOutput(LogsterOutput): if (not self.dry_run): udp_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - udp_sock.sendto(bytes(metric_string, 'ascii'), (host[0], int(host[1]))) + udp_sock.sendto(metric_string.encode('ascii'), (host[0], int(host[1]))) else: print("%s %s" % (self.statsd_host, metric_string)) |