[Python-checkins] r68230 - in python/branches/release30-maint: Lib/test/test_wsgiref.py Lib/wsgiref/headers.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Jan  3 22:38:35 2009
New Revision: 68230

Log:
Merged revisions 68216 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68216 | antoine.pitrou | 2009-01-03 21:28:05 +0100 (sam., 03 janv. 2009) | 3 lines
  
  Fix BytesWarning with -bb in wsgiref.headers.Headers.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_wsgiref.py
   python/branches/release30-maint/Lib/wsgiref/headers.py

Modified: python/branches/release30-maint/Lib/test/test_wsgiref.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_wsgiref.py	(original)
+++ python/branches/release30-maint/Lib/test/test_wsgiref.py	Sat Jan  3 22:38:35 2009
@@ -426,15 +426,20 @@
 
         h[b"Foo"] = bytes(b"bar")
         self.assertEqual("bar", h.get("Foo"))
+        self.assertEqual("bar", h.get(b"Foo"))
 
         h.setdefault(b"Bar", b"foo")
         self.assertEqual("foo", h.get("Bar"))
+        self.assertEqual("foo", h.get(b"Bar"))
 
         h.add_header(b'content-disposition', b'attachment',
             filename=b'bud.gif')
         self.assertEqual('attachment; filename="bud.gif"',
             h.get("content-disposition"))
 
+        del h['content-disposition']
+        self.assert_(b'content-disposition' not in h)
+
 
 class ErrorHandler(BaseCGIHandler):
     """Simple handler subclass for testing BaseHandler"""

Modified: python/branches/release30-maint/Lib/wsgiref/headers.py
==============================================================================
--- python/branches/release30-maint/Lib/wsgiref/headers.py	(original)
+++ python/branches/release30-maint/Lib/wsgiref/headers.py	Sat Jan  3 22:38:35 2009
@@ -73,7 +73,7 @@
 
         Does *not* raise an exception if the header is missing.
         """
-        name = name.lower()
+        name = self._convert_string_type(name.lower())
         self._headers[:] = [kv for kv in self._headers if kv[0].lower() != name]
 
     def __getitem__(self,name):
@@ -104,13 +104,13 @@
         fields deleted and re-inserted are always appended to the header list.
         If no fields exist with the given name, returns an empty list.
         """
-        name = name.lower()
+        name = self._convert_string_type(name.lower())
         return [kv[1] for kv in self._headers if kv[0].lower()==name]
 
 
     def get(self,name,default=None):
         """Get the first header value for 'name', or return 'default'"""
-        name = name.lower()
+        name = self._convert_string_type(name.lower())
         for k,v in self._headers:
             if k.lower()==name:
                 return v