Response content_length uses encoded self.response pallets#705

alexpantyukhin · Aug 13, 2016 · 17c8eb5 · 17c8eb5
1 parent da16933
commit 17c8eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py
@@ -850,6 +850,11 @@ def generate_items():
         assert resp.response == ['foo', 'bar', 'baz']
 
 
+def test_response_content_length_uses_encode():
+    r = wrappers.Response(u'你好')
+    assert r.calculate_content_length() == 6
+
+
 def test_form_data_ordering():
     class MyRequest(wrappers.Request):
         parameter_storage_class = ImmutableOrderedMultiDict

diff --git a/werkzeug/wrappers.py b/werkzeug/wrappers.py
@@ -937,7 +937,7 @@ def calculate_content_length(self):
             self._ensure_sequence()
         except RuntimeError:
             return None
-        return sum(len(x) for x in self.response)
+        return sum(len(x) for x in self.iter_encoded())
 
     def _ensure_sequence(self, mutable=False):
         """This method can be called by methods that need a sequence.  If