add decode_content option to BlockLoader for testing

Author: ikreymer

pywb/utils/loaders.py

@@ -336,6 +336,7 @@ def __init__(self, **kwargs):
         if not self.cookie_maker:
             self.cookie_maker = kwargs.get('cookie')
         self.session = None
+        self.decode_content = kwargs.get('decode_content', False)
 
     def load(self, url, offset, length):
         """
@@ -357,7 +358,8 @@ def load(self, url, offset, length):
 
         r = self.session.get(url, headers=headers, stream=True)
         r.raise_for_status()
-        r.raw.decode_content = True
+        if self.decode_content:
+            r.raw.decode_content = True
         return StreamClosingReader(r.raw)
 
 

pywb/utils/test/test_loaders.py

@@ -15,19 +15,19 @@
 IOError: [Errno 2] No such file or directory: '_x_no_such_file_'
 
 # HMAC Cookie Maker
-#>>> print_str(BlockLoader(cookie_maker=HMACCookieMaker('test', 'test', 5)).load('https://example.com', 41, 14).read())
+#>>> print_str(BlockLoader(cookie_maker=HMACCookieMaker('test', 'test', 5), decode_content=False).load('https://example.com', 41, 14).read())
 #'Example Domain'
 
 # fixed cookie, range request
->>> print_str(BlockLoader(cookie='some=value').load('https://example.com', 41, 14).read())
+>>> print_str(BlockLoader(cookie='some=value', decode_content=True).load('https://example.com', 41, 14).read())
 'Example Domain'
 
 # range request
->>> print_str(BlockLoader().load('https://example.com', 1248).read())
+>>> print_str(BlockLoader(decode_content=True).load('https://example.com', 1248).read())
 '</html>\n'
 
 # custom profile
->>> print_str(BlockLoader().load('local+https://example.com', 1248).read())
+>>> print_str(BlockLoader(decode_content=True).load('local+https://example.com', 1248).read())
 '</html>\n'
 
 # unknown loader error