Merge lp:~xnox/lazr.restfulclient/fixes into lp:lazr.restfulclient

[Dimitri John Ledkov]

Simplify setup.py and fix one python3 syntax error.

[lp:~xnox/lazr.restfulclient/fixes]

139. By Dimitri John Ledkov on 2014-06-30

SSLHandshakeError is gone in python3, add compat.

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

Resurect bootstrap.py

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

Depreciation warning readfp -> read_file

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

Take 1 at unicode

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

More stuff

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

Distch six

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

Fix standalone buildout

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

drop unused things

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

Revert to minimise diff

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

url must be string

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

More crap

[Barry Warsaw (barry)]

A few minor comments and one important question. (inline of course)

review: Needs Information

[Dimitri John Ledkov (xnox)]

Replied.

[Barry Warsaw (barry)]

On Jul 14, 2014, at 10:20 PM, Dimitri John Ledkov wrote:

>> try:
>> + from httplib2 import SSLHandshakeError
>> +except ImportError:
>> + from httplib2 import HttpLib2Error as SSLHandshakeError
>> +try:
>
>yes, it does. But it's only used to catch the error, and re-raise it with a
>helpful message that "there is an option to ignore ssl certificate
>errors". The actual class of the error has changed, but i believe the text of
>the error comes from the underlying library. This keeps compat in python2,
>and the worst case scenario the error is re-raised regardless.

So I had a look at the actual code where this is used. Ug.

>Maybe I should remove all error catching and thus not use either
>SSLHandshakeError nor HttpLib2Error?

That does seem better. Then release notes or documentation can describe
LP_DISABLE_SSL_CERTIFICATE_VALIDATION.

[lp:~xnox/lazr.restfulclient/fixes]

150. By Dimitri John Ledkov on 2014-07-28

Whitespace and review fixes, drop SSLHandshakeError handling.

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-06-19 13:28:22 +0000
+++ buildout.cfg	2014-07-28 15:39:09 +0000
@@ -17,7 +17,7 @@
 
 [standalone_test]
 recipe = zc.recipe.testrunner
-eggs = lazr.restfulclient
+eggs = lazr.restfulclient [test]
 defaults = '--tests-pattern ^tests --exit-with-status --suite-name standalone_tests'.split()
 
 [docs]

=== removed file 'ez_setup.py'
--- ez_setup.py	2010-03-24 15:14:12 +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	2014-06-05 11:25:42 +0000
+++ setup.py	2014-07-28 15:39:09 +0000
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.restfulclient.  If not, see <http://www.gnu.org/licenses/>.
 
-import ez_setup
-ez_setup.use_setuptools()
-
 import sys
 from setuptools import setup, find_packages
 
@@ -45,6 +42,7 @@
     namespace_packages=['lazr'],
     packages=find_packages('src'),
     package_dir={'':'src'},
+    package_data={'lazr.restfulclient': ['version.txt']},
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
@@ -56,11 +54,9 @@
     license='LGPL v3',
     install_requires=[
         'httplib2',
-        'lazr.authentication',
         'oauth',
         'setuptools',
         'wadllib>=1.1.4',
-        'wsgi_intercept',
         ],
     url='https://launchpad.net/lazr.restfulclient',
     download_url= 'https://launchpad.net/lazr.restfulclient/+download',
@@ -73,8 +69,11 @@
     extras_require=dict(
         docs=['Sphinx',
               'z3c.recipe.sphinxdoc'],
-        test=['lazr.restful>=0.11.0',
-              'van.testing'],
+        test=[
+            'lazr.authentication',
+            'lazr.restful>=0.11.0',
+            'wsgi_intercept',
+            ],
     ),
     test_suite='lazr.restfulclient.tests',
     )

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py	2014-06-05 11:25:42 +0000
+++ src/lazr/restfulclient/_browser.py	2014-07-28 15:39:09 +0000
@@ -41,7 +41,6 @@
 from time import sleep
 from httplib2 import (
     Http,
-    SSLHandshakeError,
     urlnorm,
     )
 try:
@@ -86,7 +85,12 @@
     """
 
     try:
-        if re_url_scheme.match(filename):
+        if isinstance(filename, unicode_type):
+            filename_match = filename.encode('utf-8')
+        else:
+            filename_match = filename
+
+        if re_url_scheme.match(filename_match):
             if isinstance(filename, bytes):
                 filename = filename.decode('utf-8')
                 filename = filename.encode('idna')
@@ -97,8 +101,8 @@
     if isinstance(filename, unicode_type):
         filename = filename.encode('utf-8')
     filemd5 = _md5(filename).hexdigest()
-    filename = re_url_scheme.sub("", filename)
-    filename = re_slash.sub(",", filename)
+    filename = re_url_scheme.sub(b"", filename)
+    filename = re_slash.sub(b",", filename)
 
     # This is the part that we changed. In stock httplib2, the
     # filename is trimmed if it's longer than 200 characters, and then
@@ -118,7 +122,7 @@
     maximum_length_before_md5_sum = maximum_filename_length - 32 - 1
     if len(filename) > maximum_length_before_md5_sum:
         filename=filename[:maximum_length_before_md5_sum]
-    return ",".join((filename, filemd5))
+    return ",".join((filename.decode('utf-8'), filemd5))
 
 
 def ssl_certificate_validation_disabled():
@@ -162,7 +166,7 @@
     def _request(self, conn, host, absolute_uri, request_uri, method, body,
                  headers, redirections, cachekey):
         """Use the authorizer to authorize an outgoing request."""
-        if headers.has_key('authorization'):
+        if 'authorization' in headers:
             # There's an authorization header left over from a
             # previous request that resulted in a redirect. Resources
             # protected by OAuth or HTTP Digest must send a distinct
@@ -308,7 +312,6 @@
             key = key + '-' + self.request_media_type
         return safename(key)
 
-
     def _getCachedHeader(self, uri, header):
         """Retrieve a cached value for an HTTP header."""
         (scheme, authority, request_uri, cachekey) = urlnorm(uri)
@@ -370,25 +373,15 @@
                              "don't have the server-side permission to see.")
 
         # Add extra headers for the request.
-        headers = {'Accept' : media_type}
+        headers = {'Accept': media_type}
         if self.user_agent is not None:
             headers['User-Agent'] = self.user_agent
         if isinstance(self._connection.cache, MultipleRepresentationCache):
             self._connection.cache.request_media_type = media_type
         if extra_headers is not None:
             headers.update(extra_headers)
-        # Make the request.
-        try:
-            response, content = self._request_and_retry(
-                str(url), method=method, body=data, headers=headers)
-        except SSLHandshakeError, e:
-            msg = str(e)
-            if "SSL3_GET_SERVER_CERTIFICATE:certificate verify failed" in msg:
-                raise SSLHandshakeError(
-                    "%s: perhaps set LP_DISABLE_SSL_CERTIFICATE_VALIDATION if "
-                    "certificate validation failed and you genuinely trust the "
-                    "remote server." % (e,))
-            raise
+        response, content = self._request_and_retry(
+            str(url), method=method, body=data, headers=headers)
         if response.status == 304:
             # The resource didn't change.
             if content == '':
@@ -447,10 +440,8 @@
         wadl_type = 'application/vnd.sun.wadl+xml'
         response, content = self._request(url, media_type=wadl_type)
         url = str(url)
-        if not isinstance(url, bytes):
-            url = url.encode('utf-8')
         if not isinstance(content, bytes):
-            content = content.encode('utf-8')    
+            content = content.encode('utf-8')
         return Application(url, content)
 
     def post(self, url, method_name, **kws):

=== modified file 'src/lazr/restfulclient/authorize/oauth.py'
--- src/lazr/restfulclient/authorize/oauth.py	2012-06-04 19:54:58 +0000
+++ src/lazr/restfulclient/authorize/oauth.py	2014-07-28 15:39:09 +0000
@@ -159,7 +159,8 @@
         """
         # Attempt to load the access token from the file.
         parser = SafeConfigParser()
-        parser.readfp(readable_file)
+        reader = getattr(parser, 'read_file', parser.readfp)
+        reader(readable_file)
         # Check the version number and extract the access token and
         # secret.  Then convert these to the appropriate instances.
         if not parser.has_section(CREDENTIALS_FILE_VERSION):

=== modified file 'src/lazr/restfulclient/resource.py'
--- src/lazr/restfulclient/resource.py	2014-06-06 23:21:56 +0000
+++ src/lazr/restfulclient/resource.py	2014-07-28 15:39:09 +0000
@@ -55,6 +55,14 @@
 import types
 import urllib
 
+import sys
+if sys.version_info[0] >= 3:
+    text_type = str
+    binary_type = bytes
+else:
+    text_type = unicode
+    binary_type = str
+
 from lazr.uri import URI
 from wadllib.application import Resource as WadlResource
 
@@ -371,7 +379,9 @@
         if self._wadl_resource.representation is None:
             # Get a representation of the linked resource.
             representation = self._root._browser.get(self._wadl_resource)
-            representation = loads(unicode(representation))
+            if isinstance(representation, binary_type):
+                representation = representation.decode('utf-8')
+            representation = loads(text_type(representation))
 
             # In rare cases, the resource type served by the
             # server conflicts with the type the client thought
@@ -381,7 +391,7 @@
             # XXX This should probably be moved into a hook method
             # defined by Entry, since it's not relevant to other
             # resource types.
-            if type(representation) == types.DictType:
+            if isinstance(representation, dict):
                 type_link = representation['resource_type_link']
                 if (type_link is not None
                     and type_link != self._wadl_resource.type_url):
@@ -521,7 +531,7 @@
             url = str(self._root_uri.append(url))
         document = self._browser.get(url)
         try:
-            representation = loads(unicode(document))
+            representation = loads(text_type(document))
         except ValueError:
             raise ValueError("%s doesn't serve a JSON document." % url)
         type_link = representation.get("resource_type_link")
@@ -574,7 +584,7 @@
             # and option values (because JSON-encoding them will screw
             # up wadllib's parameter validation). The option value thing
             # is a little hacky, but it's the best solution for now.
-            if not key in send_as_is_params:
+            if key not in send_as_is_params:
                 args[key] = dumps(value, cls=DatetimeJSONEncoder)
         if http_method in ('get', 'head', 'delete'):
             url = self.wadl_method.build_request_url(**args)
@@ -616,7 +626,7 @@
             HeaderDictionary(response))
         wadl_parameter = wadl_response.get_parameter('Location')
         wadl_resource = wadl_parameter.linked_resource
-            # Fetch a representation of the new resource.
+        # Fetch a representation of the new resource.
         response, content = self.root._browser._request(
             wadl_resource.url)
         # Return an instance of the appropriate lazr.restful
@@ -637,13 +647,13 @@
             # The operation returned a document with nothing
             # special about it.
             if content_type == self.JSON_MEDIA_TYPE:
-                return loads(unicode(content))
+                return loads(text_type(content))
             # We don't know how to process the content.
             return content
 
         # The operation returned a representation of some
         # resource. Instantiate a Resource object for it.
-        document = loads(unicode(content))
+        document = loads(text_type(content))
         if document is None:
             # The operation returned a null value.
             return document
@@ -767,7 +777,7 @@
         if response.status == 209 and content_type == self.JSON_MEDIA_TYPE:
             # The server sent back a new representation of the object.
             # Use it in preference to the existing representation.
-            new_representation = loads(unicode(content))
+            new_representation = loads(text_type(content))
             self._wadl_resource.representation = new_representation
             self._wadl_resource.media_type = content_type
 
@@ -786,7 +796,7 @@
         :rtype: int
         """
         total_size = self.total_size
-        if type(total_size) == types.IntType:
+        if isinstance(total_size, int):
             # The size was a number present in the collection
             # representation.
             return total_size
@@ -813,7 +823,7 @@
             if next_link is None:
                 break
             current_page = loads(
-                unicode(self._root._browser.get(URI(next_link))))
+                text_type(self._root._browser.get(URI(next_link))))
 
     def __getitem__(self, key):
         """Look up a slice, or a subordinate resource by index.
@@ -886,7 +896,7 @@
         # Iterate over pages until we have the correct number of entries.
         while more_needed > 0 and page_url is not None:
             representation = loads(
-                unicode(self._root._browser.get(page_url)))
+                text_type(self._root._browser.get(page_url)))
             current_page_entries = representation['entries']
             entry_dicts += current_page_entries[:more_needed]
             more_needed = desired_size - len(entry_dicts)
@@ -1011,7 +1021,7 @@
             # the resource describes itself.
             try:
                 representation = loads(
-                    unicode(self._root._browser.get(url)))
+                    text_type(self._root._browser.get(url)))
             except HTTPError as error:
                 # There's no resource corresponding to the given ID.
                 if error.response.status == 404:

=== modified file 'src/lazr/restfulclient/tests/test_atomicfilecache.py'
--- src/lazr/restfulclient/tests/test_atomicfilecache.py	2012-06-04 19:54:58 +0000
+++ src/lazr/restfulclient/tests/test_atomicfilecache.py	2014-07-28 15:39:09 +0000
@@ -23,6 +23,13 @@
 import tempfile
 import unittest
 
+import sys
+PY3 = sys.version_info[0] >= 3
+if PY3:
+    binary_type = bytes
+else:
+    binary_type = str
+
 import httplib2
 
 from lazr.restfulclient._browser import AtomicFileCache
@@ -56,15 +63,15 @@
     def test_set_key(self):
         # A key set with set() can be got by get().
         cache = self.make_file_cache()
-        cache.set('key', 'value')
-        self.assertEqual('value', cache.get('key'))
+        cache.set('key', b'value')
+        self.assertEqual(b'value', cache.get('key'))
 
     def test_set_twice_overrides(self):
         # Setting a key again overrides the value.
         cache = self.make_file_cache()
-        cache.set('key', 'value')
-        cache.set('key', 'new-value')
-        self.assertEqual('new-value', cache.get('key'))
+        cache.set('key', b'value')
+        cache.set('key', b'new-value')
+        self.assertEqual(b'new-value', cache.get('key'))
 
     def test_delete_absent_key(self):
         # Deleting a key that's not there does nothing.
@@ -76,7 +83,7 @@
         # A key once set can be deleted.  Further attempts to get that key
         # return None.
         cache = self.make_file_cache()
-        cache.set('key', 'value')
+        cache.set('key', b'value')
         cache.delete('key')
         self.assertIs(None, cache.get('key'))
 
@@ -101,7 +108,7 @@
         # probably a bug in httplib2.FileCache.
         cache = self.make_file_cache()
         self.assertRaises(TypeError, cache.set, 'answer', 42)
-        self.assertEqual('', cache.get('answer'))
+        self.assertEqual(b'', cache.get('answer'))
 
     def test_get_unicode(self):
         # get() can retrieve unicode keys.
@@ -110,19 +117,20 @@
 
     def test_set_unicode_keys(self):
         cache = self.make_file_cache()
-        cache.set(self.unicode_text, 'value')
-        self.assertEqual('value', cache.get(self.unicode_text))
+        cache.set(self.unicode_text, b'value')
+        self.assertEqual(b'value', cache.get(self.unicode_text))
 
     def test_set_unicode_value(self):
         # set() cannot store unicode values.  Values must be bytes.
         cache = self.make_file_cache()
+        error = TypeError if PY3 else UnicodeEncodeError
         self.assertRaises(
-            UnicodeEncodeError, cache.set, 'key', self.unicode_text)
+            error, cache.set, 'key', self.unicode_text)
 
     def test_delete_unicode(self):
         # delete() can remove unicode keys.
         cache = self.make_file_cache()
-        cache.set(self.unicode_text, 'value')
+        cache.set(self.unicode_text, b'value')
         cache.delete(self.unicode_text)
         self.assertIs(None, cache.get(self.unicode_text))
 
@@ -132,6 +140,12 @@
 
     file_cache_factory = AtomicFileCache
 
+    @staticmethod
+    def prefix_safename(x):
+        if isinstance(x, binary_type):
+            x = x.decode('utf-8')
+        return AtomicFileCache.TEMPFILE_PREFIX + x
+
     def test_set_non_string_value(self):
         # set() raises TypeError if asked to set a key to a non-string value.
         # Attempts to retrieve that value act is if it were never set.
@@ -144,16 +158,16 @@
     # Implementation-specific tests follow.
 
     def test_bad_safename_get(self):
-        safename = lambda x: AtomicFileCache.TEMPFILE_PREFIX + x
+        safename = self.prefix_safename
         cache = AtomicFileCache(self.cache_dir, safename)
         self.assertRaises(ValueError, cache.get, 'key')
 
     def test_bad_safename_set(self):
-        safename = lambda x: AtomicFileCache.TEMPFILE_PREFIX + x
+        safename = self.prefix_safename
         cache = AtomicFileCache(self.cache_dir, safename)
-        self.assertRaises(ValueError, cache.set, 'key', 'value')
+        self.assertRaises(ValueError, cache.set, 'key', b'value')
 
     def test_bad_safename_delete(self):
-        safename = lambda x: AtomicFileCache.TEMPFILE_PREFIX + x
+        safename = self.prefix_safename
         cache = AtomicFileCache(self.cache_dir, safename)
         self.assertRaises(ValueError, cache.delete, 'key')

=== modified file 'src/lazr/restfulclient/tests/test_error.py'
--- src/lazr/restfulclient/tests/test_error.py	2010-07-19 14:15:11 +0000
+++ src/lazr/restfulclient/tests/test_error.py	2014-07-28 15:39:09 +0000
@@ -39,10 +39,10 @@
         request = DummyRequest(status)
         error = error_for(request, content)
         if expected_error is None:
-            self.assertEquals(error, None)
+            self.assertIsNone(error)
         else:
             self.assertTrue(isinstance(error, expected_error))
-            self.assertEquals(content, error.content)
+            self.assertEqual(content, error.content)
 
     def test_no_error_for_2xx(self):
         """Make sure a 2xx response code yields no error."""

=== modified file 'src/lazr/restfulclient/tests/test_oauth.py'
--- src/lazr/restfulclient/tests/test_oauth.py	2010-10-28 22:22:32 +0000
+++ src/lazr/restfulclient/tests/test_oauth.py	2014-07-28 15:39:09 +0000
@@ -39,14 +39,14 @@
 
     def test_data_fields(self):
         consumer = Consumer("key", "secret", "application")
-        self.assertEquals(consumer.key, "key")
-        self.assertEquals(consumer.secret, "secret")
-        self.assertEquals(consumer.application_name, "application")
+        self.assertEqual(consumer.key, "key")
+        self.assertEqual(consumer.secret, "secret")
+        self.assertEqual(consumer.application_name, "application")
 
     def test_default_application_name(self):
         # Application name defaults to None
         consumer = Consumer("key", "secret")
-        self.assertEquals(consumer.application_name, None)
+        self.assertEqual(consumer.application_name, None)
 
 
 class TestSystemWideConsumer(unittest.TestCase):
@@ -105,7 +105,7 @@
         self._set_platform(('Fooix', 'String2', 'String3'), 'FooOS')
         self._set_hostname("foo")
         consumer = oauth.SystemWideConsumer("app name")
-        self.assertEquals(
+        self.assertEqual(
             consumer.key, 'System-wide: Fooix (foo)')
 
     def test_empty_linux_distribution(self):
@@ -115,7 +115,7 @@
         self._set_platform(('', '', ''), 'BarOS')
         self._set_hostname("bar")
         consumer = oauth.SystemWideConsumer("app name")
-        self.assertEquals(
+        self.assertEqual(
             consumer.key, 'System-wide: BarOS (bar)')
 
     def test_broken_linux_distribution(self):
@@ -125,7 +125,7 @@
         self._set_platform(self._broken, 'BazOS')
         self._set_hostname("baz")
         consumer = oauth.SystemWideConsumer("app name")
-        self.assertEquals(
+        self.assertEqual(
             consumer.key, 'System-wide: BazOS (baz)')
 
 
@@ -150,7 +150,7 @@
 
         # Make sure the file is readable and writable by the user, but
         # not by anyone else.
-        self.assertEquals(stat.S_IMODE(os.stat(credentials_path).st_mode),
+        self.assertEqual(stat.S_IMODE(os.stat(credentials_path).st_mode),
                           stat.S_IREAD | stat.S_IWRITE)
 
         loaded_credentials = OAuthAuthorizer.load_from_path(credentials_path)