Merge lp:~adam-collard/lazr.restfulclient/python3-httplib2-fix into lp:lazr.restfulclient

[Adam Collard]

When matching with httplib2's re_url_scheme, use unicode not bytes.

[Colin Watson (cjwatson)]

This fixes tox and is OK to merge, but it doesn't actually fix the Python 3 breakage. I'll work on that.

review: Approve

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py	2018-11-16 01:58:11 +0000
+++ src/lazr/restfulclient/_browser.py	2018-11-16 18:38:10 +0000
@@ -95,8 +95,8 @@
     """
 
     try:
-        if isinstance(filename, unicode_type):
-            filename_match = filename.encode('utf-8')
+        if isinstance(filename, bytes):
+            filename_match = filename.decode('utf-8')
         else:
             filename_match = filename
 
 
=== modified file 'src/lazr/restfulclient/tests/test_atomicfilecache.py'
--- src/lazr/restfulclient/tests/test_atomicfilecache.py	2014-07-28 15:35:35 +0000
+++ src/lazr/restfulclient/tests/test_atomicfilecache.py	2018-11-16 18:38:10 +0000
@@ -32,7 +32,8 @@
 
 import httplib2
 
-from lazr.restfulclient._browser import AtomicFileCache
+from lazr.restfulclient._browser import (
+    AtomicFileCache, safename)
 
 
 class TestFileCacheInterface(unittest.TestCase):
@@ -53,7 +54,7 @@
 
     def make_file_cache(self):
         """Make a FileCache-like object to be tested."""
-        return self.file_cache_factory(self.cache_dir)
+        return self.file_cache_factory(self.cache_dir, safename)
 
     def test_get_non_existent_key(self):
         # get() returns None if the key does not exist.