python3 portability

Author: maralla

pystatsd/__init__.py

@@ -1,4 +1,4 @@
-from statsd import Client
-from server import Server
+from .statsd import Client
+from .server import Server
 
 VERSION = (0, 1, 10)

pystatsd/daemon.py

@@ -3,8 +3,6 @@
 Based on http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
 """
 
-from __future__ import with_statement
-
 import atexit
 import os
 from signal import SIGTERM
@@ -27,23 +25,23 @@ def daemonize(self):
             if pid > 0:
                 # First parent; exit.
                 sys.exit(0)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write('Could not fork! %d (%s)\n' %
                              (e.errno, e.strerror))
             sys.exit(1)
 
         # Disconnect from parent environment.
         os.chdir('/')
         os.setsid()
-        os.umask(0022)
+        os.umask(0o022)
 
         # Fork again.
         try:
             pid = os.fork()
             if pid > 0:
                 # Second parent; exit.
                 sys.exit(0)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write('Could not fork (2nd)! %d (%s)\n' %
                              (e.errno, e.strerror))
             sys.exit(1)
@@ -98,13 +96,13 @@ def stop(self):
             while 1:
                 os.kill(pid, SIGTERM)
                 time.sleep(0.1)
-        except OSError, e:
+        except OSError as e:
             e = str(e)
             if e.find('No such process') > 0:
                 if os.path.exists(self.pidfile):
                     os.remove(self.pidfile)
                 else:
-                    print e
+                    print(e)
                     sys.exit(1)
 
     def restart(self, *args, **kw):

pystatsd/gmetric.py

@@ -81,7 +81,7 @@ def __init__(self, host, port, protocol):
     def send(self, NAME, VAL, TYPE='', UNITS='', SLOPE='both',
              TMAX=60, DMAX=0, GROUP="", SPOOF=""):
         if SLOPE not in slope_str2int:
-            raise ValueError("Slope must be one of: " + str(self.slope.keys()))
+            raise ValueError("Slope must be one of: " + str(list(self.slope.keys())))
         if TYPE not in self.type:
             raise ValueError("Type must be one of: " + str(self.type))
         if len(NAME) == 0:
@@ -90,8 +90,8 @@ def send(self, NAME, VAL, TYPE='', UNITS='', SLOPE='both',
         ( meta_msg, data_msg )  = gmetric_write(NAME, VAL, TYPE, UNITS, SLOPE, TMAX, DMAX, GROUP, SPOOF)
         # print msg
 
-        self.socket.sendto(meta_msg, self.hostport)
-        self.socket.sendto(data_msg, self.hostport)
+        self.socket.sendto(bytes(bytearray(meta_msg, "utf-8")), self.hostport)
+        self.socket.sendto(bytes(bytearray(data_msg, "utf-8")), self.hostport)
 
 def gmetric_write(NAME, VAL, TYPE, UNITS, SLOPE, TMAX, DMAX, GROUP, SPOOF):
     """
@@ -185,4 +185,4 @@ def gmetric_read(msg):
 
     g = Gmetric(options.host, options.port, options.protocol)
     g.send(options.name, options.value, options.type, options.units,
-           options.slope, options.tmax, options.dmax, options.group, options.spoof)
+           options.slope, options.tmax, options.dmax, options.group, options.spoof)

pystatsd/server.py

@@ -4,7 +4,7 @@
 import time
 import types
 import logging
-import gmetric
+from . import gmetric
 from subprocess import call
 from warnings import warn
 # from xdrlib import Packer, Unpacker
@@ -16,7 +16,7 @@
 except ImportError:
     setproctitle = None
 
-from daemon import Daemon
+from .daemon import Daemon
 
 
 __all__ = ['Server']
@@ -141,7 +141,7 @@ def on_timer(self):
         """
         try:
             self.flush()
-        except Exception, e:
+        except Exception as e:
             log.exception('Error while flushing: %s', e)
         self._set_timer()
 
@@ -157,14 +157,14 @@ def flush(self):
         for k, (v, t) in self.counters.items():
             if self.expire > 0 and t + self.expire < ts:
                 if self.debug:
-                    print "Expiring counter %s (age: %s)" % (k, ts -t)
+                    print("Expiring counter %s (age: %s)" % (k, ts -t))
                 del(self.counters[k])
                 continue
             v = float(v)
             v = v if self.no_aggregate_counters else v / (self.flush_interval / 1000)
 
             if self.debug:
-                print "Sending %s => count=%s" % (k, v)
+                print("Sending %s => count=%s" % (k, v))
 
             if self.transport == 'graphite':
                 msg = '%s.%s %s %s\n' % (self.counters_prefix, k, v, ts)
@@ -183,13 +183,13 @@ def flush(self):
         for k, (v, t) in self.gauges.items():
             if self.expire > 0 and t + self.expire < ts:
                 if self.debug:
-                    print "Expiring gauge %s (age: %s)" % (k, ts - t)
+                    print("Expiring gauge %s (age: %s)" % (k, ts - t))
                 del(self.gauges[k])
                 continue
             v = float(v)
 
             if self.debug:
-                print "Sending %s => value=%s" % (k, v)
+                print("Sending %s => value=%s" % (k, v))
 
             if self.transport == 'graphite':
                 # note: counters and gauges implicitly end up in the same namespace
@@ -205,7 +205,7 @@ def flush(self):
         for k, (v, t) in self.timers.items():
             if self.expire > 0 and t + self.expire < ts:
                 if self.debug:
-                    print "Expiring timer %s (age: %s)" % (k, ts - t)
+                    print("Expiring timer %s (age: %s)" % (k, ts - t))
                 del(self.timers[k])
                 continue
             if len(v) > 0:
@@ -227,8 +227,8 @@ def flush(self):
                 del(self.timers[k])
 
                 if self.debug:
-                    print "Sending %s ====> lower=%s, mean=%s, upper=%s, %dpct=%s, count=%s" \
-                        % (k, min, mean, max, self.pct_threshold, max_threshold, count)
+                    print("Sending %s ====> lower=%s, mean=%s, upper=%s, %dpct=%s, count=%s" \
+                        % (k, min, mean, max, self.pct_threshold, max_threshold, count))
 
                 if self.transport == 'graphite':
 
@@ -272,24 +272,24 @@ def flush(self):
             graphite = socket.socket()
             try:
                 graphite.connect((self.graphite_host, self.graphite_port))
-                graphite.sendall(stat_string)
+                graphite.sendall(bytes(bytearray(stat_string, "utf-8")))
                 graphite.close()
-            except socket.error, e:
+            except socket.error as e:
                 log.error("Error communicating with Graphite: %s" % e)
                 if self.debug:
-                    print "Error communicating with Graphite: %s" % e
+                    print("Error communicating with Graphite: %s" % e)
 
         if self.debug:
-            print "\n================== Flush completed. Waiting until next flush. Sent out %d metrics =======" \
-                % (stats)
+            print("\n================== Flush completed. Waiting until next flush. Sent out %d metrics =======" \
+                % (stats))
 
     def _set_timer(self):
         self._timer = threading.Timer(self.flush_interval / 1000, self.on_timer)
         self._timer.daemon = True
         self._timer.start()
 
     def serve(self, hostname='', port=8125):
-        assert type(port) is types.IntType, 'port is not an integer: %s' % (port)
+        assert type(port) is int, 'port is not an integer: %s' % (port)
         addr = (hostname, port)
         self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self._sock.bind(addr)

pystatsd/statsd.py

@@ -26,6 +26,7 @@ def __init__(self, host='localhost', port=8125, prefix=None):
         self.addr = (socket.gethostbyname(self.host), self.port)
         self.prefix = prefix
         self.log = logging.getLogger("pystatsd.client")
+        self.log.addHandler(logging.StreamHandler())
         self.udp_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
     def timing_since(self, stat, start, sample_rate=1):
@@ -91,17 +92,17 @@ def send(self, data, sample_rate=1):
         """
 
         if self.prefix:
-            data = dict((".".join((self.prefix, stat)), value) for stat, value in data.iteritems())
+            data = dict((".".join((self.prefix, stat)), value) for stat, value in data.items())
 
         if sample_rate < 1:
             if random.random() > sample_rate:
                 return
-            sampled_data = dict((stat, "%s|@%s" % (value, sample_rate)) for stat, value in data.iteritems())
+            sampled_data = dict((stat, "%s|@%s" % (value, sample_rate)) for stat, value in data.items())
         else:
             sampled_data = data
 
         try:
-            [self.udp_sock.sendto("%s:%s" % (stat, value), self.addr) for stat, value in sampled_data.iteritems()]
+            [self.udp_sock.sendto(bytes(bytearray("%s:%s" % (stat, value), "utf-8")), self.addr) for stat, value in sampled_data.items()]
         except:
             self.log.exception("unexpected error")
 

tests/__init__.py

@@ -1,2 +1,2 @@
-from client import *
-from server import *
+from .client import *
+from .server import *

tests/client.py

@@ -72,7 +72,7 @@ def test_basic_client_update_stats_multi(self):
 
         self.client.update_stats(stats, 5)
 
-        for stat, value in data.iteritems():
+        for stat, value in data.items():
             stat_str = stat + value
             # thanks tos9 in #python for 'splaining the return_value bit.
             self.mock_socket.return_value.sendto.assert_call_any(