[Zope-Checkins] SVN: Zope/branches/tseaver-fix_wsgi/src/ Adapt to new signature of _cookie_list.

[Tres Seaver]

Log message for revision 112839:
  Adapt to new signature of _cookie_list.

Changed:
  U   Zope/branches/tseaver-fix_wsgi/src/Products/Five/testbrowser.py
  U   Zope/branches/tseaver-fix_wsgi/src/Testing/ZopeTestCase/zopedoctest/functional.py
  U   Zope/branches/tseaver-fix_wsgi/src/ZServer/HTTPResponse.py

-=-
Modified: Zope/branches/tseaver-fix_wsgi/src/Products/Five/testbrowser.py
===================================================================
--- Zope/branches/tseaver-fix_wsgi/src/Products/Five/testbrowser.py	2010-05-29 14:46:29 UTC (rev 112838)
+++ Zope/branches/tseaver-fix_wsgi/src/Products/Five/testbrowser.py	2010-05-29 18:56:19 UTC (rev 112839)
@@ -61,7 +61,7 @@
                     l = key.find('-', start)
             headers.append((key, val))
         # get the cookies, breaking them into tuples for sorting
-        cookies = [(c[:10], c[12:]) for c in real_response._cookie_list()]
+        cookies = real_response._cookie_list()
         headers.extend(cookies)
         headers.sort()
         headers.insert(0, ('Status', "%s %s" % (status, reason)))

Modified: Zope/branches/tseaver-fix_wsgi/src/Testing/ZopeTestCase/zopedoctest/functional.py
===================================================================
--- Zope/branches/tseaver-fix_wsgi/src/Testing/ZopeTestCase/zopedoctest/functional.py	2010-05-29 14:46:29 UTC (rev 112838)
+++ Zope/branches/tseaver-fix_wsgi/src/Testing/ZopeTestCase/zopedoctest/functional.py	2010-05-29 18:56:19 UTC (rev 112839)
@@ -184,7 +184,7 @@
                   )
     header_output.setResponseStatus(response.getStatus(), response.errmsg)
     header_output.setResponseHeaders(response.headers)
-    header_output.appendResponseHeaders(response._cookie_list())
+    header_output.headersl.extend(response._cookie_list())
     header_output.appendResponseHeaders(response.accumulated_headers)
 
     sync()

Modified: Zope/branches/tseaver-fix_wsgi/src/ZServer/HTTPResponse.py
===================================================================
--- Zope/branches/tseaver-fix_wsgi/src/ZServer/HTTPResponse.py	2010-05-29 14:46:29 UTC (rev 112838)
+++ Zope/branches/tseaver-fix_wsgi/src/ZServer/HTTPResponse.py	2010-05-29 18:56:19 UTC (rev 112839)
@@ -138,7 +138,7 @@
                 val = val.replace('\n\t', '\r\n\t')
             append("%s: %s" % (key, val))
         if self.cookies:
-            chunks.extend(self._cookie_list())
+            chunks.extend(['%s: %s' % x for x in self._cookie_list()])
             
         append('')
         append(body)