From cdf91a0321b5ef34ee887ec4a22470604161890c Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Wed, 3 Aug 2011 21:22:12 +0200
Subject: [PATCH] Improve cookie info message and fix cookie test cases.

---
 linkcheck/checker/httpurl.py  |  4 ++--
 tests/cache/test_cookiejar.py | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
index b8c2cdf5..daeb0455 100644
--- a/linkcheck/checker/httpurl.py
+++ b/linkcheck/checker/httpurl.py
@@ -464,8 +464,8 @@ class HttpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport):
             # store cookies for valid links
             if self.aggregate.config['storecookies']:
                 for c in self.cookies:
-                    self.add_info(_("Sent cookie: %(cookie)s.") %
-                                  {"cookie": c})
+                    self.add_info(_("Sent Cookie: %(cookie)s.") %
+                                  {"cookie": c.client_header_value()})
                 errors = self.aggregate.cookies.add(self.headers,
                     self.urlparts[0], self.urlparts[1], self.urlparts[2])
                 if errors:
diff --git a/tests/cache/test_cookiejar.py b/tests/cache/test_cookiejar.py
index b93ac90e..7ec88b47 100644
--- a/tests/cache/test_cookiejar.py
+++ b/tests/cache/test_cookiejar.py
@@ -45,7 +45,7 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 1)
+        self.assertEqual(len(jar.cache), 1)
         # add updated cookie
         data = (
             ("FOO", "Baz"),
@@ -55,7 +55,7 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 1)
+        self.assertEqual(len(jar.cache), 1)
         # remove cookie
         data = (
             ("FOO", "Baz"),
@@ -66,7 +66,7 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 0)
+        self.assertEqual(len(jar.cache), 0)
 
     def test_cookie_cache2 (self):
         scheme = "http"
@@ -81,7 +81,7 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie2', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 1)
+        self.assertEqual(len(jar.cache), 1)
         # add updated cookie
         data = (
             ("Foo", "Baz"),
@@ -91,7 +91,7 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie2', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 1)
+        self.assertEqual(len(jar.cache), 1)
         # remove cookie
         data = (
             ("FOO", "Baz"),
@@ -102,4 +102,4 @@ class TestCookieJar (unittest.TestCase):
         value = "; ".join('%s=%s' % (key, value) for key, value in data)
         headers = get_headers('Set-Cookie2', value)
         jar.add(headers, scheme, host, path)
-        self.assertEqual(len(jar.cache[host]), 0)
+        self.assertEqual(len(jar.cache), 0)