Clean up some imports.

pyelasticsearch/client.py

@@ -7,14 +7,7 @@
 from six import (iterkeys, binary_type, text_type, string_types, integer_types,
                  iteritems, PY3)
 from six.moves import xrange
-from six.moves.urllib.parse import urlparse
-
-try:
-    # PY3
-    from urllib.parse import urlencode, quote_plus
-except ImportError:
-    # PY2
-    from urllib import urlencode, quote_plus
+from six.moves.urllib.parse import urlparse, urlencode, quote_plus
 
 from elasticsearch.connection_pool import RandomSelector
 from elasticsearch.exceptions import (ConnectionError, ConnectionTimeout,

pyelasticsearch/tests/client_tests.py

@@ -1,11 +1,7 @@
 # coding=utf-8
-import sys
-import unittest
 
 from mock import ANY, patch
 from nose.tools import eq_, ok_, assert_raises, assert_not_equal
-import requests
-import six
 
 # Test that __all__ is sufficient:
 from pyelasticsearch import *