cookies: add unittest and bugfix

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%401076

scrapy/trunk/scrapy/contrib_exp/downloadermiddleware/cookies.py

@@ -4,6 +4,7 @@ from collections import defaultdict
 
 from scrapy.core import signals
 from scrapy.utils.cookies import CookieJar
+from scrapy.core.exceptions import HttpException
 from scrapy import log
 
 class CookiesMiddleware(object):
@@ -22,7 +23,7 @@ class CookiesMiddleware(object):
             jar.set_cookie_if_ok(cookie, request)
 
         # set Cookie header
-        jar.add_cookie_header(wreq)
+        jar.add_cookie_header(request)
 
     def process_response(self, request, response, spider):
         if request.meta.get('dont_merge_cookies', False):
@@ -30,7 +31,7 @@ class CookiesMiddleware(object):
 
         # extract cookies from Set-Cookie and drop invalid/expired cookies
         jar = self.cookies[spider.domain_name]
-        jar.extract_cookies(wrsp, wreq)
+        jar.extract_cookies(response, request)
 
         # TODO: set current cookies in jar to response.cookies?
         return response

scrapy/trunk/scrapy/utils/cookies.py

@@ -1,4 +1,4 @@
-from cookielib import CookieJar as _CookieJar, DefaultCookiePolicy
+from cookielib import CookieJar as _CookieJar, DefaultCookiePolicy, Cookie
 
 
 class CookieJar(object):
@@ -13,11 +13,6 @@ class CookieJar(object):
     def add_cookie_header(self, request):
         wreq = WrappedRequest(request)
         self.jar.add_cookie_header(wreq)
-        for hdr in ('Cookie', 'Cookie2'):
-            v = wreq.get_header(hdr)
-            if hdr:
-                request.headers[hdr] = v
-
 
     @property
     def _cookies(self):