Prefer six instead of future, as it is more obvious without resorting to installing global names

Author: PCManticore

setup.py

@@ -12,7 +12,7 @@
     author_email = 'team@swiftype.com',
     url = 'https://swiftype.com/',
     packages = find_packages(),
-    install_requires = ["anyjson", "future==0.16.0"],
+    install_requires = ["anyjson", "six"],
     test_suite='nose.collector',
     classifiers = [
         'Intended Audience :: Developers',

swiftype/swiftype.py

@@ -1,13 +1,11 @@
 from __future__ import unicode_literals
 
-from future.standard_library import install_aliases
-install_aliases()
-
-import anyjson
 import base64
 import time
 import hashlib
-from urllib.parse import urlparse, urlunparse, urlencode
+
+import anyjson
+from six.moves.urllib_parse import urlunparse, urlencode
 
 try:
     # VCRpy only works when `httplib` is imported directly on Python 2.x

tests/test_swiftype.py

@@ -2,7 +2,7 @@
 import os
 import time
 import unittest2 as unittest
-from urllib.parse import urlparse, parse_qs
+from six.moves.urllib_parse import urlparse, parse_qs
 import vcr
 from mock import Mock