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, 5 insertions, 5 deletions

diff --git a/test/fixtures.py b/test/fixtures.py
index 152777c..b286619 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -4,10 +4,10 @@ import os.path
 import shutil
 import subprocess
 import tempfile
-import urllib2
+from six.moves import urllib
 import uuid
 
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse  # pylint: disable-msg=E0611
 from test.service import ExternalService, SpawnedService
 from test.testutil import get_open_port
 
@@ -42,12 +42,12 @@ class Fixture(object):
         try:
             url = url_base + distfile + '.tgz'
             logging.info("Attempting to download %s", url)
-            response = urllib2.urlopen(url)
-        except urllib2.HTTPError:
+            response = urllib.request.urlopen(url)
+        except urllib.error.HTTPError:
             logging.exception("HTTP Error")
             url = url_base + distfile + '.tar.gz'
             logging.info("Attempting to download %s", url)
-            response = urllib2.urlopen(url)
+            response = urllib.request.urlopen(url)
 
         logging.info("Saving distribution file to %s", output_file)
         with open(output_file, 'w') as output_file_fd: