From d706182e97f0417b5aa92ba1ff99e177c2924c27 Mon Sep 17 00:00:00 2001 From: samus_ Date: Fri, 2 Jan 2009 16:21:28 +0000 Subject: [PATCH] created test for body_or_str and made small improvement to scrapy.http.response --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40602 --- scrapy/trunk/scrapy/http/response.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scrapy/trunk/scrapy/http/response.py b/scrapy/trunk/scrapy/http/response.py index 0ec3a2f4b..594f684d7 100644 --- a/scrapy/trunk/scrapy/http/response.py +++ b/scrapy/trunk/scrapy/http/response.py @@ -29,10 +29,11 @@ class Response(object) : self.original_url = Url(original_url) if original_url else url # different if redirected or escaped self.headers = Headers(headers or {}) self.status = status - if isinstance(body, str): - self.body = ResponseBody(body, self.headers_encoding()) - else: + # FIXME this should be replaced with assert(isinstance(body, basestring)) since ResponseBody is not meant to be used directly + if isinstance(body, ResponseBody): self.body = body + else: + self.body = ResponseBody(body, self.headers_encoding()) self.cached = False self.request = None # request which originated this response