Merge branch '0.9'

Conflicts:
	kafka/codec.py
	kafka/version.py
	test/test_producer.py
	test/test_producer_integration.py

1 files changed, 0 insertions, 18 deletions

diff --git a/test/test_conn.py b/test/test_conn.py
index 1bdfc1e..684ffe5 100644
--- a/test/test_conn.py
+++ b/test/test_conn.py
@@ -1,4 +1,3 @@
-import logging
 import socket
 import struct
 from threading import Thread
@@ -12,9 +11,6 @@ from kafka.conn import KafkaConnection, collect_hosts, DEFAULT_SOCKET_TIMEOUT_SE
 class ConnTest(unittest.TestCase):
     def setUp(self):
 
-        # kafka.conn debug logging is verbose, so only enable in conn tests
-        logging.getLogger('kafka.conn').setLevel(logging.DEBUG)
-
         self.config = {
             'host': 'localhost',
             'port': 9090,
@@ -50,11 +46,6 @@ class ConnTest(unittest.TestCase):
         # Reset any mock counts caused by __init__
         self.MockCreateConn.reset_mock()
 
-    def tearDown(self):
-        # Return connection logging to INFO
-        logging.getLogger('kafka.conn').setLevel(logging.INFO)
-
-
     def test_collect_hosts__happy_path(self):
         hosts = "localhost:1234,localhost"
         results = collect_hosts(hosts)
@@ -193,15 +184,6 @@ class ConnTest(unittest.TestCase):
 
 
 class TestKafkaConnection(unittest.TestCase):
-
-    def setUp(self):
-        # kafka.conn debug logging is verbose, so only enable in conn tests
-        logging.getLogger('kafka.conn').setLevel(logging.DEBUG)
-
-    def tearDown(self):
-        # Return connection logging to INFO
-        logging.getLogger('kafka.conn').setLevel(logging.INFO)
-
     @mock.patch('socket.create_connection')
     def test_copy(self, socket):
         """KafkaConnection copies work as expected"""