mirror of https://github.com/python/cpython
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.
This commit is contained in:
parent
d97422115e
commit
233226e977
|
@ -421,24 +421,23 @@ class Message:
|
|||
for i in list:
|
||||
del self.headers[i]
|
||||
|
||||
def get(self, name, default=None):
|
||||
def get(self, name, default=""):
|
||||
name = name.lower()
|
||||
if self.dict.has_key(name):
|
||||
return self.dict[name]
|
||||
else:
|
||||
return default
|
||||
|
||||
def setdefault(self, name, 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)
|
||||
text = name + ": " + default
|
||||
lines = text.split("\n")
|
||||
for line in lines:
|
||||
self.headers.append(line + "\n")
|
||||
self.dict[lowername] = default
|
||||
return default
|
||||
|
||||
def has_key(self, name):
|
||||
|
|
Loading…
Reference in New Issue