Merge lp:~verterok/txstatsd/py3ksupport into lp:txstatsd

[Guillermo Gonzalez]

Initial py3k support, only the client side.

Initial py3k support, only the client side.

[Sidnei da Silva (sidnei)]

review: Approve

[lp:~verterok/txstatsd/py3ksupport]

106. By Guillermo Gonzalez on 2013-03-07

merge with trunk

107. By Guillermo Gonzalez on 2013-03-07

also support py2.6

108. By Guillermo Gonzalez on 2013-03-08

simplify version_info check

=== modified file '.bzrignore'
--- .bzrignore	2011-07-07 03:29:34 +0000
+++ .bzrignore	2013-03-08 13:29:21 +0000
@@ -1,2 +1,3 @@
 _trial_temp*
 twisted/plugins/dropin.cache
+__pycache__

=== modified file 'txstatsd/metrics/distinctmetric.py'
--- txstatsd/metrics/distinctmetric.py	2012-06-28 17:29:26 +0000
+++ txstatsd/metrics/distinctmetric.py	2013-03-08 13:29:21 +0000
@@ -28,8 +28,9 @@
 """
 import random
 import time
+import sys
 
-from zope.interface import implements
+from zope.interface import implementer, implements
 
 from txstatsd.metrics.metric import Metric
 from txstatsd.itxstatsd import IMetric
@@ -121,7 +122,8 @@
     Keeps an estimate of the distinct numbers of items seen on various
     sliding windows of time.
     """
-    implements(IMetric)
+    if sys.version_info[0:2] == (2,6):
+        implements(IMetric)
 
     def __init__(self, name, wall_time_func=time.time, prefix=""):
         """Construct a metric we expect to be periodically updated.
@@ -166,3 +168,7 @@
         for item, value in items.iteritems():
             metrics.append((self.prefix + self.name + item, value, timestamp))
         return metrics
+
+# if we are running anything >= 2.7
+if sys.version_info[0:2] >= (2,7):
+    DistinctMetricReporter = implementer(IMetric)(DistinctMetricReporter)

=== modified file 'txstatsd/metrics/metric.py'
--- txstatsd/metrics/metric.py	2012-06-28 17:29:26 +0000
+++ txstatsd/metrics/metric.py	2013-03-08 13:29:21 +0000
@@ -64,4 +64,4 @@
     def write(self, data):
         """Message the C{data} to the C{StatsD} server."""
         if self.connection is not None:
-            self.connection.write(data)
+            self.connection.write(data.encode('utf-8'))

=== modified file 'txstatsd/stats/uniformsample.py'
--- txstatsd/stats/uniformsample.py	2012-06-28 17:29:26 +0000
+++ txstatsd/stats/uniformsample.py	2013-03-08 13:29:21 +0000
@@ -27,7 +27,7 @@
     """
     A random sample of a stream of values. Uses Vitter's Algorithm R to
     produce a statistically representative sample.
-    
+
     See:
     - U{Random Sampling with a Reservoir
         <http://www.cs.umd.edu/~samir/498/vitter.pdf>}
@@ -42,7 +42,8 @@
         self._values = [0 for i in range(reservoir_size)]
         self._count = 0
         self.clear()
-    
+        self.maxint = getattr(sys, 'maxint', sys.maxsize)
+
     def clear(self):
         self._values = [0 for i in range(len(self._values))]
         self._count = 0
@@ -56,7 +57,7 @@
         if self._count <= len(self._values):
             self._values[self._count - 1] = value
         else:
-            r = random.randint(1, sys.maxint) % self._count
+            r = random.randint(1, self.maxint) % self._count
             if r < len(self._values):
                 self._values[r] = value
 

=== modified file 'txstatsd/tests/metrics/test_distinct.py'
--- txstatsd/tests/metrics/test_distinct.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/metrics/test_distinct.py	2013-03-08 13:29:21 +0000
@@ -18,6 +18,7 @@
 # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
 import random
 
@@ -45,7 +46,7 @@
             from scipy.stats import chi2
         except ImportError:
             raise SkipTest("Missing chi2, skipping")
-            
+
         N = 10000
 
         for (bits, buckets) in [(-1, 1024), (24, 256),
@@ -61,7 +62,7 @@
             value = sum(((x - N / buckets) ** 2) / (N / buckets) for x in bins)
             pval = chi2.cdf(value, N)
             if pval > 0.5:
-                print bins, pval
+                print(bins, pval)
             self.assertTrue(pval < 0.5, "bits %s, pval == %s" % (bits, pval))
     test_chi_square.skip = "Takes too long to run every time."
 
@@ -110,7 +111,7 @@
 
 
 class TestPlugin(TestCase):
-    
+
     def test_factory(self):
         self.assertTrue(distinct_plugin.distinct_metric_factory in \
                         list(getPlugins(IMetricFactory)))

=== modified file 'txstatsd/tests/metrics/test_histogrammetric.py'
--- txstatsd/tests/metrics/test_histogrammetric.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/metrics/test_histogrammetric.py	2013-03-08 13:29:21 +0000
@@ -102,7 +102,7 @@
             histogram.update(i)
 
         hist = histogram.histogram()
-        self.assertEquals(sum(hist), 10000)
+        self.assertEqual(sum(hist), 10000)
 
         total = sum(hist)
         binsize = int(total / len(hist))

=== modified file 'txstatsd/tests/metrics/test_sli.py'
--- txstatsd/tests/metrics/test_sli.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/metrics/test_sli.py	2013-03-08 13:29:21 +0000
@@ -20,8 +20,12 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import ConfigParser
-from cStringIO import StringIO
+try:
+    import ConfigParser
+    from StringIO import StringIO
+except ImportError:
+    import configparser as ConfigParser
+    from io import StringIO
 from twisted.trial.unittest import TestCase
 
 from twisted.plugins.sli_plugin import SLIMetricFactory

=== modified file 'txstatsd/tests/test_httpinfo.py'
--- txstatsd/tests/test_httpinfo.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/test_httpinfo.py	2013-03-08 13:29:21 +0000
@@ -111,7 +111,7 @@
     def test_httpinfo_error(self):
         try:
             data = yield self.get_results("status", last_flush_duration=30)
-        except HttpException, e:
+        except HttpException as e:
             self.assertEquals(e.response.code, 500)
         else:
             self.fail("Not 500")
@@ -121,7 +121,7 @@
         try:
             data = yield self.get_results("metrics/gorets",
                 timer_metrics={'gorets': 100})
-        except HttpException, e:
+        except HttpException as e:
             self.assertEquals(e.response.code, 404)
         else:
             self.fail("Not 404")

=== modified file 'txstatsd/tests/test_metrics.py'
--- txstatsd/tests/test_metrics.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/test_metrics.py	2013-03-08 13:29:21 +0000
@@ -52,28 +52,29 @@
         """Test reporting of a gauge metric sample."""
         self.metrics.gauge('gauge', 102)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.gauge:102|g')
+                         b'txstatsd.tests.gauge:102|g')
 
     def test_meter(self):
         """Test reporting of a meter metric sample."""
         self.metrics.meter('meter', 3)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.meter:3|m')
+                         b'txstatsd.tests.meter:3|m')
 
     def test_counter(self):
         """Test the increment and decrement operations."""
         self.metrics.increment('counter', 18)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.counter:18|c')
+                         b'txstatsd.tests.counter:18|c')
         self.metrics.decrement('counter', 9)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.counter:-9|c')
+                         b'txstatsd.tests.counter:-9|c')
 
     def test_timing(self):
         """Test the timing operation."""
         self.metrics.timing('timing', 101.1234)
-        self.assertEqual(self.connection.data,
-                         'txstatsd.tests.timing:101123.4|ms')
+        # to support both 2 and 3, can't use assertRegex
+        match = re.match(b'txstatsd.tests.timing:101123.4[0-9]*|ms', self.connection.data)
+        self.assertFalse(match is None)
 
     def test_timing_automatic(self):
         """Test the automatic timing operation with explicit reset"""
@@ -85,9 +86,9 @@
 
         elapsed = time.time() - start_time
 
-        label, val, units = re.split(":|\|", self.connection.data)
-        self.assertEqual(label, 'txstatsd.tests.timing')
-        self.assertEqual(units, 'ms')
+        label, val, units = re.split(b":|\|", self.connection.data)
+        self.assertEqual(label, b'txstatsd.tests.timing')
+        self.assertEqual(units, b'ms')
         self.assertTrue(100 <= float(val) <= elapsed * 1000)
 
     def test_timing_automatic_implicit_reset(self):
@@ -100,34 +101,34 @@
 
         elapsed = time.time() - start_time
 
-        label, val, units = re.split(":|\|", self.connection.data)
-        self.assertEqual(label, 'txstatsd.tests.timing')
-        self.assertEqual(units, 'ms')
+        label, val, units = re.split(b":|\|", self.connection.data)
+        self.assertEqual(label, b'txstatsd.tests.timing')
+        self.assertEqual(units, b'ms')
         self.assertTrue(100 <= float(val) <= elapsed * 1000)
 
     def test_generic(self):
         """Test the GenericMetric class."""
         self.metrics.report('users', "pepe", "pd")
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.users:pepe|pd')
+                         b'txstatsd.tests.users:pepe|pd')
 
     def test_generic_extra(self):
         """Test the GenericMetric class."""
         self.metrics.report('users', "pepe", "pd", 100)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.users:pepe|pd|100')
+                         b'txstatsd.tests.users:pepe|pd|100')
 
     def test_empty_namespace(self):
         """Test reporting of an empty namespace."""
         self.metrics.namespace = None
         self.metrics.gauge('gauge', 213)
         self.assertEqual(self.connection.data,
-                         'gauge:213|g')
+                         b'gauge:213|g')
 
         self.metrics.namespace = ''
         self.metrics.gauge('gauge', 413)
         self.assertEqual(self.connection.data,
-                         'gauge:413|g')
+                         b'gauge:413|g')
 
 
 class TestExtendedMetrics(TestMetrics):
@@ -139,21 +140,21 @@
         """Test the increment and decrement operations."""
         self.metrics.increment('counter', 18)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.counter:18|c')
+                         b'txstatsd.tests.counter:18|c')
         self.metrics.decrement('counter', 9)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.counter:9|c')
+                         b'txstatsd.tests.counter:9|c')
 
     def test_sli(self):
         """Test SLI call."""
         self.metrics.sli('users', 100)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.users:100|sli')
+                         b'txstatsd.tests.users:100|sli')
 
         self.metrics.sli('users', 200, 2)
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.users:200|sli|2')
+                         b'txstatsd.tests.users:200|sli|2')
 
         self.metrics.sli_error('users')
         self.assertEqual(self.connection.data,
-                         'txstatsd.tests.users:error|sli')
+                         b'txstatsd.tests.users:error|sli')

=== modified file 'txstatsd/tests/test_router.py'
--- txstatsd/tests/test_router.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/test_router.py	2013-03-08 13:29:21 +0000
@@ -179,7 +179,7 @@
 
         class Collect(DatagramProtocol):
 
-            def datagramReceived(cself, data, (host, port)):
+            def datagramReceived(cself, data, host_port):
                 self.got_data(data)
 
         self.port = reactor.listenUDP(0, Collect())

=== modified file 'txstatsd/tests/test_service.py'
--- txstatsd/tests/test_service.py	2012-06-28 17:29:26 +0000
+++ txstatsd/tests/test_service.py	2013-03-08 13:29:21 +0000
@@ -20,8 +20,12 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import tempfile
-import ConfigParser
-from StringIO import StringIO
+try:
+    import ConfigParser
+    from StringIO import StringIO
+except ImportError:
+    import configparser as ConfigParser
+    from io import StringIO
 
 from twisted.trial.unittest import TestCase
 
@@ -203,7 +207,8 @@
     def __init__(self):
         self.monitor_response = None
 
-    def datagramReceived(self, data, (host, port)):
+    def datagramReceived(self, data, host_port):
+        host, port = host_port
         self.monitor_response = data