Merge lp:~verterok/txstatsd/consistenthashing-py3k into lp:txstatsd

[Guillermo Gonzalez]

add py3k support for the consistenthashing client

This branch adds py3k support for the consistenthashing client code.

[Sidnei da Silva (sidnei)]

review: Approve

=== modified file 'txstatsd/client.py'
--- txstatsd/client.py	2013-01-08 14:54:00 +0000
+++ txstatsd/client.py	2013-05-15 18:59:30 +0000
@@ -38,7 +38,7 @@
     # for sys.stdout.encoding at the module-level of twisted.python.log. See:
     # http://twistedmatrix.com/trac/ticket/6244 for more details.
     pass
-        
+
 from txstatsd.hashing import ConsistentHashRing
 
 
@@ -111,7 +111,7 @@
 
     def write(self, data):
         """Hash based on the metric name, then send to the right client."""
-        metric_name, rest = data.split(":", 1)
+        metric_name, rest = str(data).split(":", 1)
         client = self.ring.get_node(metric_name)
         client.write(data)
 

=== modified file 'txstatsd/hashing.py'
--- txstatsd/hashing.py	2012-06-28 17:29:26 +0000
+++ txstatsd/hashing.py	2013-05-15 18:59:30 +0000
@@ -33,8 +33,8 @@
             self.add_node(node)
 
     def compute_ring_position(self, key):
-        big_hash = md5(str(key)).hexdigest()
-        small_hash = long(big_hash[:8], 16)
+        big_hash = md5(key.encode('utf-8')).hexdigest()
+        small_hash = int(big_hash[:8], 16)
         return small_hash
 
     def add_node(self, node):