From c44cafe4f58d6c5e5a3a8142f81ee0201fb8268a Mon Sep 17 00:00:00 2001 From: Mikhail Korobov Date: Tue, 1 Sep 2015 04:11:33 +0500 Subject: [PATCH] PY3 fix UserAgentMiddleware tests --- scrapy/downloadermiddlewares/useragent.py | 2 +- tests/py3-ignores.txt | 1 - tests/test_downloadermiddleware_useragent.py | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scrapy/downloadermiddlewares/useragent.py b/scrapy/downloadermiddlewares/useragent.py index 17793cad7..d24750c69 100644 --- a/scrapy/downloadermiddlewares/useragent.py +++ b/scrapy/downloadermiddlewares/useragent.py @@ -20,4 +20,4 @@ class UserAgentMiddleware(object): def process_request(self, request, spider): if self.user_agent: - request.headers.setdefault('User-Agent', self.user_agent) + request.headers.setdefault(b'User-Agent', self.user_agent) diff --git a/tests/py3-ignores.txt b/tests/py3-ignores.txt index d405950f9..95e2181e3 100644 --- a/tests/py3-ignores.txt +++ b/tests/py3-ignores.txt @@ -12,7 +12,6 @@ tests/test_downloadermiddleware_httpproxy.py tests/test_downloadermiddleware.py tests/test_downloadermiddleware_redirect.py tests/test_downloadermiddleware_retry.py -tests/test_downloadermiddleware_useragent.py tests/test_engine.py tests/test_mail.py tests/test_pipeline_files.py diff --git a/tests/test_downloadermiddleware_useragent.py b/tests/test_downloadermiddleware_useragent.py index 741c8de76..1e41fdace 100644 --- a/tests/test_downloadermiddleware_useragent.py +++ b/tests/test_downloadermiddleware_useragent.py @@ -17,7 +17,7 @@ class UserAgentMiddlewareTest(TestCase): spider, mw = self.get_spider_and_mw('default_useragent') req = Request('http://scrapytest.org/') assert mw.process_request(req, spider) is None - self.assertEquals(req.headers['User-Agent'], 'default_useragent') + self.assertEquals(req.headers['User-Agent'], b'default_useragent') def test_remove_agent(self): # settings UESR_AGENT to None should remove the user agent @@ -34,15 +34,16 @@ class UserAgentMiddlewareTest(TestCase): mw.spider_opened(spider) req = Request('http://scrapytest.org/') assert mw.process_request(req, spider) is None - self.assertEquals(req.headers['User-Agent'], 'spider_useragent') + self.assertEquals(req.headers['User-Agent'], b'spider_useragent') def test_header_agent(self): spider, mw = self.get_spider_and_mw('default_useragent') spider.user_agent = 'spider_useragent' mw.spider_opened(spider) - req = Request('http://scrapytest.org/', headers={'User-Agent': 'header_useragent'}) + req = Request('http://scrapytest.org/', + headers={'User-Agent': 'header_useragent'}) assert mw.process_request(req, spider) is None - self.assertEquals(req.headers['User-Agent'], 'header_useragent') + self.assertEquals(req.headers['User-Agent'], b'header_useragent') def test_no_agent(self): spider, mw = self.get_spider_and_mw(None)