Merge pull request #227 from wizzat-feature/py3

Python 3 Support

Conflicts:
	kafka/producer.py
	test/test_client.py
	test/test_client_integration.py
	test/test_codec.py
	test/test_consumer.py
	test/test_consumer_integration.py
	test/test_failover_integration.py
	test/test_producer.py
	test/test_producer_integration.py
	test/test_protocol.py
	test/test_util.py

1 files changed, 6 insertions, 6 deletions

diff --git a/test/test_conn.py b/test/test_conn.py
index 931ace7..7b3beb7 100644
--- a/test/test_conn.py
+++ b/test/test_conn.py
@@ -2,19 +2,19 @@ import socket
 import struct
 
 import mock
-import unittest2
+from . import unittest
 
 from kafka.common import ConnectionError
 from kafka.conn import KafkaConnection, collect_hosts, DEFAULT_SOCKET_TIMEOUT_SECONDS
 
-class ConnTest(unittest2.TestCase):
+class ConnTest(unittest.TestCase):
     def setUp(self):
         self.config = {
             'host': 'localhost',
             'port': 9090,
             'request_id': 0,
-            'payload': 'test data',
-            'payload2': 'another packet'
+            'payload': b'test data',
+            'payload2': b'another packet'
         }
 
         # Mocking socket.create_connection will cause _sock to always be a
@@ -35,12 +35,12 @@ class ConnTest(unittest2.TestCase):
             struct.pack('>%ds' % payload_size, self.config['payload']),
             struct.pack('>i', payload2_size),
             struct.pack('>%ds' % payload2_size, self.config['payload2']),
-            ''
+            b''
         ]
 
         # Create a connection object
         self.conn = KafkaConnection(self.config['host'], self.config['port'])
-        
+
         # Reset any mock counts caused by __init__
         self.MockCreateConn.reset_mock()