Merge pull request scrapy#878 from andrewshir/master

Fix bug for ".local" host name
DamonGuo · Sep 20, 2014 · c543fe6 · c543fe6
2 parents a312ebf + e583c03
commit c543fe6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/scrapy/http/cookies.py b/scrapy/http/cookies.py
@@ -29,7 +29,7 @@ def add_cookie_header(self, request):
         if not IPV4_RE.search(req_host):
             hosts = potential_domain_matches(req_host)
             if req_host.find(".") == -1:
-                hosts += req_host + ".local"
+                hosts += [req_host + ".local"]
         else:
             hosts = [req_host]
 

diff --git a/tests/test_downloadermiddleware_cookies.py b/tests/test_downloadermiddleware_cookies.py
@@ -8,6 +8,12 @@
 
 class CookiesMiddlewareTest(TestCase):
 
+    def test_local_domain(self):
+        request = Request("http://example-host/", cookies={'currencyCookie': 'USD'})
+        assert self.mw.process_request(request, self.spider) is None
+        assert 'Cookie' in request.headers
+        assert 'currencyCookie' in request.headers['Cookie']
+
     def assertCookieValEqual(self, first, second, msg=None):
         cookievaleq = lambda cv: re.split(';\s*', cv)
         return self.assertEqual(