Merge branch 'master' into logging-update

Author: pawelmhm

scrapyrt/resources.py

@@ -92,7 +92,7 @@ def render_object(self, obj, request):
         request.setHeader('Access-Control-Allow-Methods',
                           ', '.join(getattr(self, 'allowedMethods', [])))
         request.setHeader('Access-Control-Allow-Headers', 'X-Requested-With')
-        request.setHeader('Content-Length', len(r))
+        request.setHeader('Content-Length', str(len(r)))
         return r.encode("utf8")
 
 

tests/test_resource_serviceresource.py

@@ -172,7 +172,7 @@ def test_render_object(self):
         set_header_mock.assert_any_call('Access-Control-Allow-Origin', '*')
         set_header_mock.assert_any_call('Access-Control-Allow-Headers',
                                         'X-Requested-With')
-        set_header_mock.assert_any_call('Content-Length', len(result))
+        set_header_mock.assert_any_call('Content-Length', str(len(result)))
         # request.setHeader('Access-Control-Allow-Methods',
         #                   ', '.join(getattr(self, 'allowedMethods', [])))
         headers = dict(self.headers)