[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - HTTPResponse.py:1.69.4.8

[Stefan H. Holek]

Update of /cvs-repository/Zope/lib/python/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv14524/lib/python/ZPublisher

Modified Files:
      Tag: Zope-2_6-branch
	HTTPResponse.py 
Log Message:
Collector #1160: HTTPResponse.expireCookie() potentially didn't
when an 'expires' keyword argument was passed.


=== Zope/lib/python/ZPublisher/HTTPResponse.py 1.69.4.7 => 1.69.4.8 ===
--- Zope/lib/python/ZPublisher/HTTPResponse.py:1.69.4.7	Mon Jan 19 14:32:26 2004
+++ Zope/lib/python/ZPublisher/HTTPResponse.py	Mon Apr 26 06:10:33 2004
@@ -492,10 +492,10 @@
         '''
         name = str(name)
 
-        dict = {'max_age':0, 'expires':'Wed, 31-Dec-97 23:59:59 GMT'}
-        for k, v in kw.items():
-            dict[k] = v
-        apply(HTTPResponse.setCookie, (self, name, 'deleted'), dict)
+        d = kw.copy()
+        d['max_age'] = 0
+        d['expires'] = 'Wed, 31-Dec-97 23:59:59 GMT'
+        apply(HTTPResponse.setCookie, (self, name, 'deleted'), d)
 
     def setCookie(self,name,value,**kw):
         '''\