[Python-checkins] CVS: python/dist/src/Lib rfc822.py,1.55,1.56

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv16471

Modified Files:
	rfc822.py 
Log Message:

Per discussion with Barry, make the default value for both get() and
setdefault() the empty string.  In setdefault(), use + to join the value
to create the entry for the headers attribute so that TypeError is raised
if the value is of the wrong type.


Index: rfc822.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/rfc822.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** rfc822.py	2001/05/22 14:58:10	1.55
--- rfc822.py	2001/05/22 19:36:50	1.56
***************
*** 422,426 ****
              del self.headers[i]
  
!     def get(self, name, default=None):
          name = name.lower()
          if self.dict.has_key(name):
--- 422,426 ----
              del self.headers[i]
  
!     def get(self, name, default=""):
          name = name.lower()
          if self.dict.has_key(name):
***************
*** 429,443 ****
              return default
  
!     def setdefault(self, name, default=''):
          lowername = name.lower()
          if self.dict.has_key(lowername):
              return self.dict[lowername]
          else:
!             default = default or ""
!             self.dict[lowername] = default
!             text = "%s: %s" % (name, default)
              lines = text.split("\n")
              for line in lines:
                  self.headers.append(line + "\n")
              return default
  
--- 429,442 ----
              return default
  
!     def setdefault(self, name, default=""):
          lowername = name.lower()
          if self.dict.has_key(lowername):
              return self.dict[lowername]
          else:
!             text = name + ": " + default
              lines = text.split("\n")
              for line in lines:
                  self.headers.append(line + "\n")
+             self.dict[lowername] = default
              return default