use unittest instead of unittest2

Author: maralla

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.5"
   - "2.6"
   - "2.7"
   - "3.3"

pystatsd/server.py

@@ -305,7 +305,7 @@ def signal_handler(signal, frame):
             data, addr = self._sock.recvfrom(self.buf)
             try:
                 self.process(data)
-            except Exception, error:
+            except Exception as error:
                 log.error("Bad data from %s: %s",addr,error) 
 
 

pystatsd/statsd.py

@@ -97,12 +97,13 @@ def send(self, data, sample_rate=1):
         if sample_rate < 1:
             if random.random() > sample_rate:
                 return
-            sampled_data = dict((stat, "%s|@%s" % (value, sample_rate)) for stat, value in data.items())
+            sampled_data = dict((stat, "%s|@%s" % (value, sample_rate))
+                                for stat, value in data.items())
         else:
             sampled_data = data
 
         try:
-            [self.udp_sock.sendto(bytes(bytearray("%s:%s" % (stat, value), "utf-8")), self.addr) for stat, value in sampled_data.items()]
+            [self.udp_sock.sendto(bytes("%s:%s" % (stat, value), "utf-8"), self.addr) for stat, value in sampled_data.items()]
         except:
             self.log.exception("unexpected error")
 

requirements.txt

@@ -1,3 +1,2 @@
-unittest2
 nose
-mock
+mock

setup.py

@@ -14,9 +14,7 @@ def read(fname):
     url='https://github.com/sivy/py-statsd',
     license = "BSD",
     packages=['pystatsd'],
-    install_requires=['argparse >= 1.2'],
     long_description=read('README.md'),
-    requires=['argparse'],
     classifiers=[
         "License :: OSI Approved :: BSD License",
     ],

tests/client.py

@@ -1,12 +1,12 @@
 import time
-import unittest2
+import unittest
 import mock
 import socket
 
 from pystatsd.statsd import Client
 
 
-class ClientBasicsTestCase(unittest2.TestCase):
+class ClientBasicsTestCase(unittest.TestCase):
     """
     Tests the basic operations of the client
     """
@@ -40,7 +40,7 @@ def test_basic_client_incr(self):
 
         # thanks tos9 in #python for 'splaining the return_value bit.
         self.mock_socket.return_value.sendto.assert_called_with(
-            stat_str, self.addr)
+            bytes(stat_str, 'utf-8'), self.addr)
 
     def test_basic_client_decr(self):
         stat = 'pystatsd.unittests.test_basic_client_decr'
@@ -50,7 +50,7 @@ def test_basic_client_decr(self):
 
         # thanks tos9 in #python for 'splaining the return_value bit.
         self.mock_socket.return_value.sendto.assert_called_with(
-            stat_str, self.addr)
+            bytes(stat_str, 'utf-8'), self.addr)
 
     def test_basic_client_update_stats(self):
         stat = 'pystatsd.unittests.test_basic_client_update_stats'
@@ -60,7 +60,7 @@ def test_basic_client_update_stats(self):
 
         # thanks tos9 in #python for 'splaining the return_value bit.
         self.mock_socket.return_value.sendto.assert_called_with(
-            stat_str, self.addr)
+            bytes(stat_str, 'utf-8'), self.addr)
 
     def test_basic_client_update_stats_multi(self):
         stats = [
@@ -76,7 +76,7 @@ def test_basic_client_update_stats_multi(self):
             stat_str = stat + value
             # thanks tos9 in #python for 'splaining the return_value bit.
             self.mock_socket.return_value.sendto.assert_call_any(
-                stat_str, self.addr)
+                bytes(stat_str, 'utf-8'), self.addr)
 
     def test_basic_client_timing(self):
         stat = 'pystatsd.unittests.test_basic_client_timing.time'
@@ -86,7 +86,7 @@ def test_basic_client_timing(self):
 
         # thanks tos9 in #python for 'splaining the return_value bit.
         self.mock_socket.return_value.sendto.assert_called_with(
-            stat_str, self.addr)
+            bytes(stat_str, 'utf-8'), self.addr)
 
     def test_basic_client_timing_since(self):
         ts = (1971, 6, 29, 4, 13, 0, 0, 0, -1)
@@ -104,7 +104,7 @@ def test_basic_client_timing_since(self):
 
         # thanks tos9 in #python for 'splaining the return_value bit.
         self.mock_socket.return_value.sendto.assert_called_with(
-            stat_str, self.addr)
+            bytes(stat_str, 'utf-8'), self.addr)
 
         mock_time_patcher.stop()
 

tests/server.py

@@ -1,11 +1,11 @@
-import unittest2
+import unittest
 import mock
 
 # from pystatsd.statsd import Client
 from pystatsd.server import Server
 
 
-class ServerBasicsTestCase(unittest2.TestCase):
+class ServerBasicsTestCase(unittest.TestCase):
     """
     Tests the basic operations of the client
     """
@@ -19,4 +19,7 @@ def setUp(self):
     def test_server_create(self):
         server = Server()
 
-        self.assertIsNotNone(server)
+        if getattr(self, "assertIsNotNone", False):
+            self.assertIsNotNone(server)
+        else:
+            assert server is not None