Merge lp:~xnox/launchpadlib/py3-new into lp:launchpadlib

[Dimitri John Ledkov]

Initial python3 port.

[lp:~xnox/launchpadlib/py3-new]

140. By Dimitri John Ledkov on 2014-07-04

Remove ez_setup

141. By Dimitri John Ledkov on 2014-07-04

json.loads text only

[Barry Warsaw (barry)]

Generally looks good. I have only minor comments.

[lp:~xnox/launchpadlib/py3-new]

142. By Dimitri John Ledkov on 2014-07-14

Address barry's review comments.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-05-30 18:49:47 +0000
+++ MANIFEST.in	2014-07-14 20:30:23 +0000
@@ -1,4 +1,3 @@
-include ez_setup.py
 exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
 global-include *.txt *.xsl *.png
 prune _bootstrap

=== modified file 'buildout.cfg'
--- buildout.cfg	2011-01-07 18:01:06 +0000
+++ buildout.cfg	2014-07-14 20:30:23 +0000
@@ -1,4 +1,5 @@
 [buildout]
+extends = versions.cfg
 parts =
     interpreter
     test

=== removed file 'ez_setup.py'
--- ez_setup.py	2010-03-24 16:21:31 +0000
+++ ez_setup.py	1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c11"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
-    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
-    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
-    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
-}
-
-import sys, os
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        from md5 import md5
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15, min_version=None
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    # Work around a hack in the ez_setup.py file from simplejson==1.7.3.
-    if min_version:
-        version = min_version
-
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
-    def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-    try:
-        import pkg_resources
-    except ImportError:
-        return do_download()       
-    try:
-        pkg_resources.require("setuptools>="+version); return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
-            sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return do_download()
-    except pkg_resources.DistributionNotFound:
-        return do_download()
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-    from md5 import md5
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-

=== modified file 'setup.py'
--- setup.py	2013-07-20 23:05:20 +0000
+++ setup.py	2014-07-14 20:30:23 +0000
@@ -18,9 +18,6 @@
 
 """Setup for the launchpadlib library."""
 
-import ez_setup
-ez_setup.use_setuptools()
-
 import sys
 from setuptools import setup, find_packages
 

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2013-07-20 23:05:20 +0000
+++ src/launchpadlib/credentials.py	2014-07-14 20:30:23 +0000
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 """launchpadlib credentials and authentication support."""
 
 __metaclass__ = type
@@ -28,13 +30,23 @@
     ]
 
 import cgi
-from cStringIO import StringIO
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 import httplib2
 import os
 import stat
 import time
-from urllib import urlencode
-from urlparse import urljoin
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
 import webbrowser
 from base64 import (
     b64decode,
@@ -46,6 +58,14 @@
 except ImportError:
     import simplejson as json
 
+if bytes is str:
+    # Python 2
+    unicode_type = unicode
+    binary_type = str
+else:
+    unicode_type = str
+    binary_type = bytes
+    
 from lazr.restfulclient.errors import HTTPError
 from lazr.restfulclient.authorize.oauth import (
     AccessToken as _AccessToken,
@@ -116,6 +136,8 @@
         sio = StringIO()
         self.save(sio)
         serialized = sio.getvalue()
+        if isinstance(serialized, unicode_type):
+            serialized = serialized.encode('utf-8')
         return serialized
 
     @classmethod
@@ -125,6 +147,8 @@
         This should probably be moved into OAuthAuthorizer.
         """
         credentials = cls()
+        if not isinstance(value, unicode_type):
+            value = value.decode('utf-8')
         credentials.load(StringIO(value))
         return credentials
 
@@ -164,6 +188,8 @@
         if token_format == self.DICT_TOKEN_FORMAT:
             headers['Accept'] = 'application/json'
         response, content = _http_post(url, headers, params)
+        if isinstance(content, binary_type):
+            content = content.decode('utf-8')
         if token_format == self.DICT_TOKEN_FORMAT:
             params = json.loads(content)
             if context is not None:
@@ -272,7 +298,7 @@
             self.do_save(credentials, unique_consumer_id)
         except EXPLOSIVE_ERRORS:
             raise
-        except Exception, e:
+        except Exception as e:
             if self.credential_save_failed is None:
                 raise e
             self.credential_save_failed()
@@ -327,7 +353,7 @@
     integrating third-party websites into Launchpad.
     """
 
-    B64MARKER = "<B64>"
+    B64MARKER = b"<B64>"
 
     @staticmethod
     def _ensure_keyring_imported():
@@ -359,7 +385,8 @@
         credential_string = keyring.get_password(
             'launchpadlib', unique_key)
         if credential_string is not None:
-            credential_string = credential_string.encode('utf8')
+            if isinstance(credential_string, unicode_type):
+                credential_string = credential_string.encode('utf8')
             if credential_string.startswith(self.B64MARKER):
                 try:
                     credential_string = b64decode(
@@ -586,7 +613,7 @@
         does not require any user interaction--it's solely
         informative.
         """
-        print message
+        print(message)
 
     def make_end_user_authorize_token(self, credentials, request_token):
         """Have the end-user authorize the token in their browser."""
@@ -600,7 +627,7 @@
                 credentials.exchange_request_token_for_access_token(
                     self.web_root)
                 break
-            except HTTPError, e:
+            except HTTPError as e:
                 if e.response.status == 403:
                     # The user decided not to authorize this
                     # application.
@@ -610,8 +637,8 @@
                     pass
                 else:
                     # There was an error accessing the server.
-                    print "Unexpected response from Launchpad:"
-                    print e
+                    print("Unexpected response from Launchpad:")
+                    print(e)
 
 
 class TokenAuthorizationException(Exception):

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2011-11-10 15:29:38 +0000
+++ src/launchpadlib/launchpad.py	2014-07-14 20:30:23 +0000
@@ -22,7 +22,10 @@
     ]
 
 import os
-import urlparse
+try:
+    from urllib.parse import urlsplit
+except:
+    from urlparse import urlsplit
 import warnings
 
 from lazr.restfulclient.resource import (
@@ -596,15 +599,14 @@
             raise ValueError("Must set $HOME or pass 'launchpadlib_dir' to "
                 "indicate location to store cached data")
         if not os.path.exists(launchpadlib_dir):
-            os.makedirs(launchpadlib_dir, 0700)
-        os.chmod(launchpadlib_dir, 0700)
+            os.makedirs(launchpadlib_dir, 0o700)
+        os.chmod(launchpadlib_dir, 0o700)
         # Determine the real service root.
         service_root = uris.lookup_service_root(service_root)
         # Each service root has its own cache and credential dirs.
-        scheme, host_name, path, query, fragment = urlparse.urlsplit(
-            service_root)
+        scheme, host_name, path, query, fragment = urlsplit(service_root)
         service_root_dir = os.path.join(launchpadlib_dir, host_name)
         cache_path = os.path.join(service_root_dir, 'cache')
         if not os.path.exists(cache_path):
-            os.makedirs(cache_path, 0700)
+            os.makedirs(cache_path, 0o700)
         return (service_root, launchpadlib_dir, cache_path, service_root_dir)

=== modified file 'src/launchpadlib/testing/launchpad.py'
--- src/launchpadlib/testing/launchpad.py	2011-09-15 09:15:42 +0000
+++ src/launchpadlib/testing/launchpad.py	2014-07-14 20:30:23 +0000
@@ -66,7 +66,10 @@
 """
 
 from datetime import datetime
-
+import collections
+import sys
+if sys.version_info[0] >= 3:
+    basestring = str
 
 JSON_MEDIA_TYPE = "application/json"
 
@@ -202,7 +205,7 @@
         result = self._children.get(name, _marker)
         if result is _marker:
             result = self._values.get(name, _marker)
-            if callable(result):
+            if isinstance(result, collections.Callable):
                 return self._wrap_method(name, result)
         if name in self.special_methods:
             return lambda: True
@@ -276,8 +279,8 @@
         @param partial_object: A dict with key/value pairs representing
             attributes and methods.
         """
-        for name, value in partial_object.iteritems():
-            if callable(value):
+        for name, value in partial_object.items():
+            if isinstance(value, collections.Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else:
@@ -299,11 +302,11 @@
         """
         name = None
         child_resource_type = None
-        for name, value in partial_object.iteritems():
+        for name, value in partial_object.items():
             if name == "entries":
                 name, child_resource_type = (
                     self._check_entries(resource_type, value))
-            elif callable(value):
+            elif isinstance(value, collections.Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else:

=== modified file 'src/launchpadlib/testing/tests/test_launchpad.py'
--- src/launchpadlib/testing/tests/test_launchpad.py	2011-09-13 13:48:51 +0000
+++ src/launchpadlib/testing/tests/test_launchpad.py	2014-07-14 20:30:23 +0000
@@ -109,7 +109,7 @@
         A L{FakeLaunchpad} instantiated without credentials has its
         C{credentials} attribute set to C{None}.
         """
-        self.assertEqual(None, self.launchpad.credentials)
+        self.assertIsNone(self.launchpad.credentials)
 
     def test_set_undefined_property(self):
         """

=== modified file 'src/launchpadlib/tests/test_credential_store.py'
--- src/launchpadlib/tests/test_credential_store.py	2011-12-02 18:57:15 +0000
+++ src/launchpadlib/tests/test_credential_store.py	2014-07-14 20:30:23 +0000
@@ -22,6 +22,12 @@
 
 from base64 import b64decode
 
+if bytes is str:
+    # Python 2
+    unicode_type = unicode
+else:
+    unicode_type = str
+
 from launchpadlib.testing.helpers import (
     fake_keyring,
     InMemoryKeyring,
@@ -60,7 +66,7 @@
         credential = self.make_credential("consumer key")
         self.store.save(credential, "unique key")
         credential2 = self.store.load("unique key")
-        self.assertEquals(credential.consumer.key, credential2.consumer.key)
+        self.assertEqual(credential.consumer.key, credential2.consumer.key)
 
     def test_unique_id_doesnt_matter(self):
         # If a file contains a credential, that credential will be
@@ -68,7 +74,7 @@
         credential = self.make_credential("consumer key")
         self.store.save(credential, "some key")
         credential2 = self.store.load("some other key")
-        self.assertEquals(credential.consumer.key, credential2.consumer.key)
+        self.assertEqual(credential.consumer.key, credential2.consumer.key)
 
     def test_file_only_contains_one_credential(self):
         # A credential file may contain only one credential. If you
@@ -80,7 +86,7 @@
         self.store.save(credential1, "unique key 1")
         self.store.save(credential1, "unique key 2")
         loaded = self.store.load("unique key 1")
-        self.assertEquals(loaded.consumer.key, credential2.consumer.key)
+        self.assertEqual(loaded.consumer.key, credential2.consumer.key)
 
 
 class TestKeyringCredentialStore(CredentialStoreTestCase):
@@ -96,7 +102,7 @@
             credential = self.make_credential("consumer key")
             self.store.save(credential, "unique key")
             credential2 = self.store.load("unique key")
-            self.assertEquals(
+            self.assertEqual(
                 credential.consumer.key, credential2.consumer.key)
 
     def test_lookup_by_unique_key(self):
@@ -110,11 +116,12 @@
             self.store.save(credential2, "key 2")
 
             loaded1 = self.store.load("key 1")
-            self.assertEquals(
+            self.assertTrue(loaded1)
+            self.assertEqual(
                 credential1.consumer.key, loaded1.consumer.key)
 
             loaded2 = self.store.load("key 2")
-            self.assertEquals(
+            self.assertEqual(
                 credential2.consumer.key, loaded2.consumer.key)
 
     def test_reused_unique_id_overwrites_old_credential(self):
@@ -129,14 +136,14 @@
             self.store.save(credential2, "the only key")
 
             loaded = self.store.load("the only key")
-            self.assertEquals(
+            self.assertEqual(
                 credential2.consumer.key, loaded.consumer.key)
 
     def test_bad_unique_id_returns_none(self):
         # Trying to load a credential without providing a good unique
         # ID will get you None.
         with fake_keyring(self.keyring):
-            self.assertEquals(None, self.store.load("no such key"))
+            self.assertIsNone(self.store.load("no such key"))
 
     def test_keyring_returns_unicode(self):
         # Kwallet is reported to sometimes return Unicode, which broke the
@@ -144,18 +151,23 @@
         # handled correctly.  (See bug lp:877374)
         class UnicodeInMemoryKeyring(InMemoryKeyring):
             def get_password(self, service, username):
-                return unicode(
-                    super(UnicodeInMemoryKeyring, self).get_password(
-                        service, username))
+                password = super(UnicodeInMemoryKeyring, self).get_password(
+                    service, username)
+                if isinstance(password, unicode_type):
+                    password = password.encode('utf-8')
+                return password
 
         self.keyring = UnicodeInMemoryKeyring()
         with fake_keyring(self.keyring):
             credential = self.make_credential("consumer key")
+            self.assertTrue(credential)
+            # Shouldn't this test actually use a unicodish key?!
             self.store.save(credential, "unique key")
             credential2 = self.store.load("unique key")
-            self.assertEquals(
+            self.assertTrue(credential2)
+            self.assertEqual(
                 credential.consumer.key, credential2.consumer.key)
-            self.assertEquals(
+            self.assertEqual(
                 credential.consumer.secret, credential2.consumer.secret)
 
     def test_nonencoded_key_handled(self):
@@ -172,9 +184,9 @@
             credential = self.make_credential("consumer key")
             self.store.save(credential, "unique key")
             credential2 = self.store.load("unique key")
-            self.assertEquals(
+            self.assertEqual(
                 credential.consumer.key, credential2.consumer.key)
-            self.assertEquals(
+            self.assertEqual(
                 credential.consumer.secret, credential2.consumer.secret)
 
     def test_corrupted_key_handled(self):

=== modified file 'src/launchpadlib/tests/test_http.py'
--- src/launchpadlib/tests/test_http.py	2014-05-12 13:21:36 +0000
+++ src/launchpadlib/tests/test_http.py	2014-07-14 20:30:23 +0000
@@ -174,10 +174,10 @@
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 1)
+        self.assertEqual(self.engine.access_tokens_obtained, 1)
 
     def test_bad_token(self):
         """If our token is bad, we get another one."""
@@ -186,10 +186,10 @@
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 2)
+        self.assertEqual(self.engine.access_tokens_obtained, 2)
 
     def test_expired_token(self):
         """If our token is expired, we get another one."""
@@ -199,10 +199,10 @@
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 2)
+        self.assertEqual(self.engine.access_tokens_obtained, 2)
 
     def test_unknown_token(self):
         """If our token is unknown, we get another one."""
@@ -212,10 +212,10 @@
             Response(200, SIMPLE_WADL),
             Response(200, SIMPLE_JSON)]
 
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 2)
+        self.assertEqual(self.engine.access_tokens_obtained, 2)
 
     def test_delayed_error(self):
         """We get another token no matter when the error happens."""
@@ -224,10 +224,10 @@
             Response(401, "Expired token."),
             Response(200, SIMPLE_JSON)]
 
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 2)
+        self.assertEqual(self.engine.access_tokens_obtained, 2)
 
     def test_many_errors(self):
         """We'll keep getting new tokens as long as tokens are the problem."""
@@ -237,10 +237,10 @@
             Response(401, "Expired token."),
             Response(401, "Invalid token."),
             Response(200, SIMPLE_JSON)]
-        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        self.assertEqual(self.engine.access_tokens_obtained, 0)
         launchpad = SimulatedResponsesLaunchpad.login_with(
             'application name', authorization_engine=self.engine)
-        self.assertEquals(self.engine.access_tokens_obtained, 4)
+        self.assertEqual(self.engine.access_tokens_obtained, 4)
 
     def test_other_unauthorized(self):
         """If the token is not at fault, a 401 error raises an exception."""

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2014-05-12 13:26:58 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2014-07-14 20:30:23 +0000
@@ -82,7 +82,7 @@
             self.assertEqual(len(caught), 1)
             warning, = caught
             self.assertTrue(issubclass(warning.category, DeprecationWarning))
-            self.assertTrue("no longer exists" in warning.message.message)
+            self.assertIn("no longer exists", str(warning))
 
     def test_short_names(self):
         # Ensure the short service names are all supported.
@@ -180,7 +180,7 @@
         root = uris.service_roots['staging'] + version
         try:
             Launchpad(None, None, None, service_root=root, version=version)
-        except ValueError, e:
+        except ValueError as e:
             self.assertTrue(str(e).startswith(
                 "It looks like you're using a service root that incorporates "
                 'the name of the web service version ("version-foo")'))
@@ -239,7 +239,7 @@
         # The credentials are stored unencrypted in the file you
         # specify.
         credentials = Credentials.load_from_path(filename)
-        self.assertEquals(credentials.consumer.key,
+        self.assertEqual(credentials.consumer.key,
                           launchpad.credentials.consumer.key)
         os.remove(filename)
 
@@ -305,7 +305,7 @@
         launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
         # Verify a newly created-by-hand directory is insecure
         os.mkdir(launchpadlib_dir)
-        os.chmod(launchpadlib_dir, 0755)
+        os.chmod(launchpadlib_dir, 0o755)
         self.assertTrue(os.path.isdir(launchpadlib_dir))
         statinfo = os.stat(launchpadlib_dir)
         mode = stat.S_IMODE(statinfo.st_mode)
@@ -337,7 +337,7 @@
         launchpad = NoNetworkLaunchpad.login_with(
             'not important', service_root=SERVICE_ROOT,
             launchpadlib_dir=launchpadlib_dir, version="foo")
-        self.assertEquals(launchpad.passed_in_args['version'], 'foo')
+        self.assertEqual(launchpad.passed_in_args['version'], 'foo')
 
         # Now execute the same test a second time. This time, the
         # credentials are loaded from disk and a different code path
@@ -346,7 +346,7 @@
         launchpad = NoNetworkLaunchpad.login_with(
             'not important', service_root=SERVICE_ROOT,
             launchpadlib_dir=launchpadlib_dir, version="bar")
-        self.assertEquals(launchpad.passed_in_args['version'], 'bar')
+        self.assertEqual(launchpad.passed_in_args['version'], 'bar')
 
     def test_application_name_is_propagated(self):
         # Create a Launchpad instance for a given application name.
@@ -357,7 +357,7 @@
         launchpad = NoNetworkLaunchpad.login_with(
             'very important', service_root=SERVICE_ROOT,
             launchpadlib_dir=launchpadlib_dir)
-        self.assertEquals(
+        self.assertEqual(
             launchpad.credentials.consumer.application_name, 'very important')
 
         # Now execute the same test a second time. This time, the
@@ -368,7 +368,7 @@
         launchpad = NoNetworkLaunchpad.login_with(
             'very important', service_root=SERVICE_ROOT,
             launchpadlib_dir=launchpadlib_dir)
-        self.assertEquals(
+        self.assertEqual(
             launchpad.credentials.consumer.application_name, 'very important')
 
     def test_authorization_engine_is_propagated(self):
@@ -378,8 +378,8 @@
         engine = NoNetworkAuthorizationEngine(
             SERVICE_ROOT, 'application name')
         NoNetworkLaunchpad.login_with(authorization_engine=engine)
-        self.assertEquals(engine.request_tokens_obtained, 1)
-        self.assertEquals(engine.access_tokens_obtained, 1)
+        self.assertEqual(engine.request_tokens_obtained, 1)
+        self.assertEqual(engine.access_tokens_obtained, 1)
 
     def test_login_with_must_identify_application(self):
         # If you call login_with without identifying your application
@@ -443,10 +443,10 @@
         # levels into login_with().
         launchpad = NoNetworkLaunchpad.login_with(
             consumer_name="consumer", allow_access_levels=['FOO'])
-        self.assertEquals(launchpad.credentials.consumer.key, "consumer")
-        self.assertEquals(launchpad.credentials.consumer.application_name,
+        self.assertEqual(launchpad.credentials.consumer.key, "consumer")
+        self.assertEqual(launchpad.credentials.consumer.application_name,
                           None)
-        self.assertEquals(launchpad.authorization_engine.allow_access_levels,
+        self.assertEqual(launchpad.authorization_engine.allow_access_levels,
                           ['FOO'])
 
     def test_desktop_integration_doesnt_happen_without_consumer_name(self):
@@ -456,7 +456,7 @@
         # integration is performed.
         launchpad = NoNetworkLaunchpad.login_with(
             'application name', allow_access_levels=['FOO'])
-        self.assertEquals(launchpad.authorization_engine.allow_access_levels,
+        self.assertEqual(launchpad.authorization_engine.allow_access_levels,
                           ['DESKTOP_INTEGRATION'])
 
     def test_no_credentials_creates_new_credential(self):
@@ -471,7 +471,7 @@
                          NoNetworkAuthorizationEngine.ACCESS_TOKEN_KEY)
         self.assertEqual(launchpad.credentials.consumer.application_name,
                          'app name')
-        self.assertEquals(launchpad.authorization_engine.allow_access_levels,
+        self.assertEqual(launchpad.authorization_engine.allow_access_levels,
                           ['DESKTOP_INTEGRATION'])
         # The expected arguments were passed in to the Launchpad
         # constructor.
@@ -580,16 +580,16 @@
         with warnings.catch_warnings(record=True) as caught:
             warnings.simplefilter("always")
             NoNetworkLaunchpad.login('consumer', 'token', 'secret')
-            self.assertEquals(len(caught), 1)
-            self.assertEquals(caught[0].category, DeprecationWarning)
+            self.assertEqual(len(caught), 1)
+            self.assertEqual(caught[0].category, DeprecationWarning)
 
     def test_get_token_and_login_is_deprecated(self):
         # get_token_and_login() works but triggers a deprecation warning.
         with warnings.catch_warnings(record=True) as caught:
             warnings.simplefilter("always")
             NoNetworkLaunchpad.get_token_and_login('consumer')
-            self.assertEquals(len(caught), 1)
-            self.assertEquals(caught[0].category, DeprecationWarning)
+            self.assertEqual(len(caught), 1)
+            self.assertEqual(caught[0].category, DeprecationWarning)
 
 
 class TestCredenitialSaveFailedCallback(unittest.TestCase):
@@ -624,7 +624,7 @@
                 'not important', service_root=service_root,
                 launchpadlib_dir=launchpadlib_dir,
                 credential_save_failed=callback)
-            self.assertEquals(len(callback_called), 1)
+            self.assertEqual(len(callback_called), 1)
 
     def test_default_credentials_save_failed_is_to_raise_exception(self):
         # If saving the credentials did not succeed and no callback was
@@ -666,18 +666,18 @@
                 launchpadlib_dir=launchpadlib_dir)
             consumer_name = launchpad.credentials.consumer.key
 
-        application_key = keyring.data.keys()[0][1]
+        application_key = list(keyring.data.keys())[0][1]
 
         # Both the consumer name (normally the name of the application) and
         # the service root (the URL of the service being accessed) are
         # included in the key when storing credentials.
-        self.assert_(service_root in application_key)
-        self.assert_(consumer_name in application_key)
+        self.assertIn(service_root, application_key)
+        self.assertIn(consumer_name, application_key)
 
         # The key used to store the credentials is of this structure (and
         # shouldn't change between releases or stored credentials will be
         # "forgotten").
-        self.assertEquals(application_key, consumer_name + '@' + service_root)
+        self.assertEqual(application_key, consumer_name + '@' + service_root)
 
     def test_same_app_different_servers(self):
         launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
@@ -698,8 +698,8 @@
         # is of the test mechanism, not a test assertion).
         assert len(keyring.data.keys()) == 2
 
-        application_key_1 = keyring.data.keys()[0][1]
-        application_key_2 = keyring.data.keys()[1][1]
+        application_key_1 = list(keyring.data.keys())[0][1]
+        application_key_2 = list(keyring.data.keys())[1][1]
         self.assertNotEqual(application_key_1, application_key_2)
 
 

=== modified file 'src/launchpadlib/uris.py'
--- src/launchpadlib/uris.py	2014-05-12 13:26:49 +0000
+++ src/launchpadlib/uris.py	2014-07-14 20:30:23 +0000
@@ -26,8 +26,11 @@
     'lookup_web_root',
     'web_root_for_service_root',
     ]
-
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+    
 import warnings
 from lazr.uri import URI
 

=== added file 'versions.cfg'
--- versions.cfg	1970-01-01 00:00:00 +0000
+++ versions.cfg	2014-07-14 20:30:23 +0000
@@ -0,0 +1,85 @@
+[buildout]
+versions = versions
+allow-picked-versions = false
+use-dependency-links = false
+
+
+[versions]
+# Alphabetical, case-SENSITIVE, blank line after this comment
+
+Jinja2 = 2.5.5
+Pygments = 1.4
+RestrictedPython = 3.6.0
+Sphinx = 1.0.1
+ZConfig = 2.7.1
+ZODB3 = 3.9.2
+distribute = 0.6.27
+docutils = 0.5
+elementtree = 1.2.7-20070827-preview
+epydoc = 3.0.1
+fixtures = 0.3.9
+grokcore.component = 1.6
+httplib2 = 0.7.4
+lazr.authentication = 0.1.2
+lazr.batchnavigator = 1.2.7
+lazr.delegates = 1.2.0
+lazr.enum = 1.1.2
+lazr.lifecycle = 1.0
+lazr.restful = 0.19.7
+lazr.uri = 1.0.2
+lazr.restfulclient = 0.13.3
+testresources = 0.2.7
+keyring = 3.8
+lxml = 2.2.7
+martian = 0.11
+oauth = 1.0.1
+pytz = 2010o
+setuptools = 0.6c11
+simplejson = 2.5.0
+testtools = 0.9.11
+transaction = 1.0.0
+van.testing = 3.0.0
+wadllib = 1.2.0
+wsgi-intercept = 0.5.1
+wsgiref = 0.1.2
+z3c.recipe.scripts = 1.0.1
+z3c.recipe.sphinxdoc = 0.0.8
+z3c.recipe.staticlxml = 0.7.1
+z3c.recipe.tag = 0.2.0
+zc.buildout = 1.5.2
+zc.lockfile = 1.0.0
+zc.recipe.cmmi = 1.3.1
+zc.recipe.egg = 1.3.2
+zc.recipe.testrunner = 1.4.0
+zdaemon = 2.0.4
+zope.annotation = 3.5.0
+zope.app.pagetemplate = 3.11.2
+zope.browser = 1.3
+zope.browserpage = 3.12.2
+zope.cachedescriptors = 3.5.1
+zope.component = 3.10.0
+zope.configuration = 3.6.0
+zope.contenttype = 3.5.1
+zope.copy = 3.5.0
+zope.datetime = 3.4.0
+zope.dublincore = 3.8.1
+zope.event = 3.5.0-1
+zope.exceptions = 3.5.2
+zope.hookable = 3.4.1
+zope.i18n = 3.7.4
+zope.i18nmessageid = 3.5.3
+zope.interface = 3.5.2
+zope.lifecycleevent = 3.6.2
+zope.location = 3.9.0
+zope.pagetemplate = 3.5.2
+zope.processlifetime = 1.0
+zope.proxy = 3.6.1
+zope.publisher = 3.12.6
+zope.schema = 3.7.1
+zope.security = 3.8.0
+zope.size = 3.4.1
+zope.tal = 3.5.2
+zope.tales = 3.5.1
+zope.testing = 3.10.2
+zope.testrunner = 4.0.0b5
+zope.traversing = 3.13.1