Use 2to3 automatically during the build process.

It doesn't make a ton of changes in truth, but it's a recommended step on the conversion path. It does handle the `urllib` path though!

Author: joncotton

README.rst

@@ -18,6 +18,10 @@ Or setuptools::
   git clone git://github.com/embedly/embedly-python.git
   python setup.py
 
+Setup requires Setuptools 0.7+ or Distribute 0.6.2+ in order to take advantage
+of the ``2to3`` option. Setup will still run on earlier versions but you'll
+see a warning and ``2to3`` won't happen. Read more in the Setuptools
+`docs <http://pythonhosted.org/setuptools/python3.html>`_
 
 Getting Started
 ---------------

embedly/client.py

@@ -4,15 +4,11 @@
 
 The embedly object that interacts with the service
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 import re
 import httplib2
 import json
-
-try:  # pragma: no cover
-    from urllib.parse import quote, urlencode  # pragma: no cover
-except ImportError:  # Python 2  # pragma: no cover
-    from urllib import quote, urlencode  # pragma: no cover
+from urllib import quote, urlencode
 
 from .models import Url
 

setup.py

@@ -40,7 +40,9 @@ def get_version():
     packages=['embedly'],
     install_requires=required,
     tests_require=tests_require,
+    test_suite="embedly.tests",
     zip_safe=True,
+    use_2to3=True,
     classifiers=(
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',