From 9d66d7cdf99a9143808ec8448279ad4aba039e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 27 Apr 2012 00:31:03 -0300
Subject: [PATCH] be consistent removing BOM from decoded bodies. #123

---
 scrapy/http/response/text.py       |  8 ++++--
 scrapy/tests/test_http_response.py | 43 ++++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/scrapy/http/response/text.py b/scrapy/http/response/text.py
index 175ba02b3..db77e1f06 100644
--- a/scrapy/http/response/text.py
+++ b/scrapy/http/response/text.py
@@ -6,7 +6,7 @@ See documentation in docs/topics/request-response.rst
 """
 
 from w3lib.encoding import html_to_unicode, resolve_encoding, \
-    html_body_declared_encoding, http_content_type_encoding, to_unicode
+    html_body_declared_encoding, http_content_type_encoding
 from scrapy.http.response import Response
 from scrapy.utils.python import memoizemethod_noargs
 from scrapy.conf import settings
@@ -55,8 +55,12 @@ class TextResponse(Response):
 
     def body_as_unicode(self):
         """Return body as unicode"""
+        # check for self.encoding before _cached_ubody just in
+        # _body_inferred_encoding is called
+        benc = self.encoding
         if self._cached_ubody is None:
-            self._cached_ubody = to_unicode(self.body, self.encoding)
+            charset = 'charset=%s' % benc
+            self._cached_ubody = html_to_unicode(charset, self.body)[1]
         return self._cached_ubody
 
     @memoizemethod_noargs
diff --git a/scrapy/tests/test_http_response.py b/scrapy/tests/test_http_response.py
index 2d3ca5ecf..26c66453a 100644
--- a/scrapy/tests/test_http_response.py
+++ b/scrapy/tests/test_http_response.py
@@ -111,7 +111,7 @@ class ResponseText(BaseResponseTest):
 
     def test_no_unicode_url(self):
         self.assertRaises(TypeError, self.response_class, u'http://www.example.com')
-    
+
 
 class TextResponseTest(BaseResponseTest):
 
@@ -188,19 +188,52 @@ class TextResponseTest(BaseResponseTest):
 
     def test_declared_encoding_invalid(self):
         """Check that unknown declared encodings are ignored"""
-        r = self.response_class("http://www.example.com", headers={"Content-type": ["text/html; charset=UKNOWN"]}, body="\xc2\xa3")
+        r = self.response_class("http://www.example.com",
+                                headers={"Content-type": ["text/html; charset=UKNOWN"]},
+                                body="\xc2\xa3")
         self.assertEqual(r._declared_encoding(), None)
         self._assert_response_values(r, 'utf-8', u"\xa3")
 
     def test_utf16(self):
         """Test utf-16 because UnicodeDammit is known to have problems with"""
-        r = self.response_class("http://www.example.com", body='\xff\xfeh\x00i\x00', encoding='utf-16')
+        r = self.response_class("http://www.example.com",
+                                body='\xff\xfeh\x00i\x00',
+                                encoding='utf-16')
         self._assert_response_values(r, 'utf-16', u"hi")
 
     def test_invalid_utf8_encoded_body_with_valid_utf8_BOM(self):
-        r6 = self.response_class("http://www.example.com", headers={"Content-type": ["text/html; charset=utf-8"]}, body="\xef\xbb\xbfWORD\xe3\xab")
+        r6 = self.response_class("http://www.example.com",
+                                 headers={"Content-type": ["text/html; charset=utf-8"]},
+                                 body="\xef\xbb\xbfWORD\xe3\xab")
         self.assertEqual(r6.encoding, 'utf-8')
-        self.assertEqual(r6.body_as_unicode(), u'\ufeffWORD\ufffd\ufffd')
+        self.assertEqual(r6.body_as_unicode(), u'WORD\ufffd\ufffd')
+
+    def test_bom_is_removed_from_body(self):
+        # Inferring encoding from body also cache decoded body as sideeffect,
+        # this test tries to ensure that calling response.encoding and
+        # response.body_as_unicode() in indistint order doesn't affect final
+        # values for encoding and decoded body.
+        url = 'http://example.com'
+        body = "\xef\xbb\xbfWORD"
+        headers = {"Content-type": ["text/html; charset=utf-8"]}
+
+        # Test response without content-type and BOM encoding
+        response = self.response_class(url, body=body)
+        self.assertEqual(response.encoding, 'utf-8')
+        self.assertEqual(response.body_as_unicode(), u'WORD')
+        response = self.response_class(url, body=body)
+        self.assertEqual(response.body_as_unicode(), u'WORD')
+        self.assertEqual(response.encoding, 'utf-8')
+
+        # Body caching sideeffect isn't triggered when encoding is declared in
+        # content-type header but BOM still need to be removed from decoded
+        # body
+        response = self.response_class(url, headers=headers, body=body)
+        self.assertEqual(response.encoding, 'utf-8')
+        self.assertEqual(response.body_as_unicode(), u'WORD')
+        response = self.response_class(url, headers=headers, body=body)
+        self.assertEqual(response.body_as_unicode(), u'WORD')
+        self.assertEqual(response.encoding, 'utf-8')
 
     def test_replace_wrong_encoding(self):
         """Test invalid chars are replaced properly"""