Merge pull request psf#135 from sigmavirus24/bug/134

Ignore corrupted caches

Author: ionrock

cachecontrol/serialize.py

@@ -174,7 +174,7 @@ def _loads_v1(self, request, data):
     def _loads_v2(self, request, data):
         try:
             cached = json.loads(zlib.decompress(data).decode("utf8"))
-        except ValueError:
+        except (ValueError, zlib.error):
             return
 
         # We need to decode the items that we've base64 encoded

tests/test_serialization.py

@@ -60,6 +60,11 @@ def test_read_v1_serialized_with_py2_TypeError(self):
         # string.
         assert resp.data == 'Hello World'.encode('utf-8')
 
+    def test_read_v2_corrupted_cache(self):
+        # This should prevent a regression of bug #134
+        req = Mock()
+        assert self.serializer._loads_v2(req, b'') is None
+
     def test_read_version_three_streamable(self, url):
         original_resp = requests.get(url, stream=True)
         req = original_resp.request