Scrapy, a fast high-level web crawling & scraping framework for Python.
add better messages for when response content isn't text (closes #2264)
Elias Dorneles9c9690c76cf9
diff --git a/scrapy/http/response/__init__.py b/scrapy/http/response/__init__.pyindex 983154001..58ad414f1 100644--- a/scrapy/http/response/__init__.py+++ b/scrapy/http/response/__init__.py@@ -9,6 +9,8 @@ from six.moves.urllib.parse import urljoinfrom scrapy.http.headers import Headersfrom scrapy.utils.trackref import object_reffrom scrapy.http.common import obsolete_setter+from scrapy.exceptions import NotSupported+class Response(object_ref):@@ -80,3 +82,22 @@ class Response(object_ref):"""Join this Response's url with a possible relative url to form anabsolute interpretation of the latter."""return urljoin(self.url, url)++ @property+ def text(self):+ """For subclasses of TextResponse, this will return the body+ as text (unicode object in Python 2 and str in Python 3)+ """+ raise AttributeError("Response content isn't text")++ def css(self, *a, **kw):+ """Shortcut method implemented only by responses whose content+ is text (subclasses of TextResponse).+ """+ raise NotSupported("Response content isn't text")++ def xpath(self, *a, **kw):+ """Shortcut method implemented only by responses whose content+ is text (subclasses of TextResponse).+ """+ raise NotSupported("Response content isn't text")diff --git a/tests/test_http_response.py b/tests/test_http_response.pyindex c7f36687a..7624aa4c4 100644--- a/tests/test_http_response.py+++ b/tests/test_http_response.py@@ -7,6 +7,7 @@ from scrapy.http import (Request, Response, TextResponse, HtmlResponse,XmlResponse, Headers)from scrapy.selector import Selectorfrom scrapy.utils.python import to_native_str+from scrapy.exceptions import NotSupportedclass BaseResponseTest(unittest.TestCase):@@ -127,6 +128,18 @@ class BaseResponseTest(unittest.TestCase):absolute = 'http://www.example.com/test'self.assertEqual(joined, absolute)+ def test_shortcut_attributes(self):+ r = self.response_class("http://example.com", body=b'hello')+ if self.response_class == Response:+ msg = "Response content isn't text"+ self.assertRaisesRegexp(AttributeError, msg, getattr, r, 'text')+ self.assertRaisesRegexp(NotSupported, msg, r.css, 'body')+ self.assertRaisesRegexp(NotSupported, msg, r.xpath, '//body')+ else:+ r.text+ r.css('body')+ r.xpath('//body')+class TextResponseTest(BaseResponseTest):