Merge lp:~cjwatson/lazr.restfulclient/httplib2-compat into lp:lazr.restfulclient

[Colin Watson]

Add compatibility with httplib2 0.12.0.

The safename hack here is still pretty gross, but this should get things minimally working again.

[William Grant (wgrant)]

review: Approve

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py	2017-09-04 14:31:42 +0000
+++ src/lazr/restfulclient/_browser.py	2018-11-16 01:59:34 +0000
@@ -33,6 +33,7 @@
 import atexit
 import errno
 import os
+import re
 import shutil
 import sys
 import tempfile
@@ -82,7 +83,10 @@
 
 
 # A drop-in replacement for httplib2's safename.
-from httplib2 import _md5, re_url_scheme, re_slash
+from httplib2 import _md5, re_url_scheme
+
+re_slash = re.compile(r'[?/:|]+')
+
 def safename(filename):
     """Return a filename suitable for the cache.
 

=== modified file 'src/lazr/restfulclient/docs/NEWS.rst'
--- src/lazr/restfulclient/docs/NEWS.rst	2018-05-08 08:28:46 +0000
+++ src/lazr/restfulclient/docs/NEWS.rst	2018-11-16 01:59:34 +0000
@@ -2,6 +2,11 @@
 NEWS for lazr.restfulclient
 ===========================
 
+0.14.1
+======
+
+  - Add compatibility with httplib2 0.12.0.  [bug=1803558]
+
 0.14.0 (2018-05-08)
 ===================