Index: Demo/scripts/mboxconvert.py =================================================================== --- Demo/scripts/mboxconvert.py (revision 64003) +++ Demo/scripts/mboxconvert.py (working copy) @@ -89,7 +89,7 @@ t = time.mktime(tt) else: sys.stderr.write( - 'Unparseable date: %r\n' % (m.getheader('Date'),)) + 'Unparseable date: %r\n' % (m.get('Date'),)) t = os.fstat(f.fileno())[stat.ST_MTIME] print('From', email, time.ctime(t)) # Copy RFC822 header Index: Tools/versioncheck/pyversioncheck.py =================================================================== --- Tools/versioncheck/pyversioncheck.py (revision 64003) +++ Tools/versioncheck/pyversioncheck.py (working copy) @@ -53,7 +53,7 @@ print(' Cannot open:', arg) return -1, None, None msg = rfc822.Message(fp, seekable=0) - newversion = msg.getheader('current-version') + newversion = msg.get('current-version') if not newversion: if verbose >= VERBOSE_EACHFILE: print(' No "Current-Version:" header in URL or URL not found') Index: Tools/scripts/mailerdaemon.py =================================================================== --- Tools/scripts/mailerdaemon.py (revision 64003) +++ Tools/scripts/mailerdaemon.py (working copy) @@ -14,7 +14,7 @@ self.sub = '' def is_warning(self): - sub = self.getheader('Subject') + sub = self.get('Subject') if not sub: return 0 sub = sub.lower() Index: Lib/wsgiref/simple_server.py =================================================================== --- Lib/wsgiref/simple_server.py (revision 64003) +++ Lib/wsgiref/simple_server.py (working copy) @@ -106,7 +106,7 @@ else: env['CONTENT_TYPE'] = self.headers.typeheader - length = self.headers.getheader('content-length') + length = self.headers.get('content-length') if length: env['CONTENT_LENGTH'] = length Index: Lib/smtpd.py =================================================================== --- Lib/smtpd.py (revision 64003) +++ Lib/smtpd.py (working copy) @@ -421,9 +421,9 @@ # These headers are required for the proper execution of Mailman. All # MTAs in existance seem to add these if the original message doesn't # have them. - if not msg.getheader('from'): + if not msg.get('from'): msg['From'] = mailfrom - if not msg.getheader('date'): + if not msg.get('date'): msg['Date'] = time.ctime(time.time()) for rcpt, listname, command in listnames: print('sending message to', rcpt, file=DEBUGSTREAM) Index: Lib/http/client.py =================================================================== --- Lib/http/client.py (revision 64003) +++ Lib/http/client.py (working copy) @@ -430,7 +430,7 @@ self.msg.fp = None # are we using the chunked-style of transfer encoding? - tr_enc = self.msg.getheader("transfer-encoding") + tr_enc = self.msg.get("transfer-encoding") if tr_enc and tr_enc.lower() == "chunked": self.chunked = 1 self.chunk_left = None @@ -443,7 +443,7 @@ # do we have a Content-Length? # NOTE: RFC 2616, S4.4, #3 says we ignore this if tr_enc is "chunked" self.length = None - length = self.msg.getheader("content-length") + length = self.msg.get("content-length") if length and not self.chunked: try: self.length = int(length) @@ -470,11 +470,11 @@ self.will_close = 1 def _check_close(self): - conn = self.msg.getheader("connection") + conn = self.msg.get("connection") if self.version == 11: # An HTTP/1.1 proxy is assumed to stay open unless # explicitly closed. - conn = self.msg.getheader("connection") + conn = self.msg.get("connection") if conn and "close" in conn.lower(): return True return False @@ -483,7 +483,7 @@ # connections, using rules different than HTTP/1.1. # For older HTTP, Keep-Alive indicates persistent connection. - if self.msg.getheader("keep-alive"): + if self.msg.get("keep-alive"): return False # At least Akamai returns a "Connection: Keep-Alive" header, @@ -492,7 +492,7 @@ return False # Proxy-Connection is a netscape hack. - pconn = self.msg.getheader("proxy-connection") + pconn = self.msg.get("proxy-connection") if pconn and "keep-alive" in pconn.lower(): return False @@ -644,7 +644,7 @@ def getheader(self, name, default=None): if self.msg is None: raise ResponseNotReady() - return self.msg.getheader(name, default) + return self.msg.get(name, default) def getheaders(self): """Return list of (header, value) tuples.""" Index: Lib/http/server.py =================================================================== --- Lib/http/server.py (revision 64003) +++ Lib/http/server.py (working copy) @@ -955,7 +955,7 @@ if host != self.client_address[0]: env['REMOTE_HOST'] = host env['REMOTE_ADDR'] = self.client_address[0] - authorization = self.headers.getheader("authorization") + authorization = self.headers.get("authorization") if authorization: authorization = authorization.split() if len(authorization) == 2: @@ -977,10 +977,10 @@ env['CONTENT_TYPE'] = self.headers.type else: env['CONTENT_TYPE'] = self.headers.typeheader - length = self.headers.getheader('content-length') + length = self.headers.get('content-length') if length: env['CONTENT_LENGTH'] = length - referer = self.headers.getheader('referer') + referer = self.headers.get('referer') if referer: env['HTTP_REFERER'] = referer accept = [] @@ -990,7 +990,7 @@ else: accept = accept + line[7:].split(',') env['HTTP_ACCEPT'] = ','.join(accept) - ua = self.headers.getheader('user-agent') + ua = self.headers.get('user-agent') if ua: env['HTTP_USER_AGENT'] = ua co = filter(None, self.headers.getheaders('cookie')) Index: Lib/cgi.py =================================================================== --- Lib/cgi.py (revision 64003) +++ Lib/cgi.py (working copy) @@ -268,7 +268,7 @@ if terminator: # At start of next part. Read headers first. headers = mimetools.Message(fp) - clength = headers.getheader('content-length') + clength = headers.get('content-length') if clength: try: bytes = int(clength) Index: Lib/pydoc.py =================================================================== --- Lib/pydoc.py (revision 64003) +++ Lib/pydoc.py (working copy) @@ -1910,8 +1910,8 @@ def __init__(self, fp, seekable=1): Message = self.__class__ Message.__bases__[0].__bases__[0].__init__(self, fp, seekable) - self.encodingheader = self.getheader('content-transfer-encoding') - self.typeheader = self.getheader('content-type') + self.encodingheader = self.get('content-transfer-encoding') + self.typeheader = self.get('content-type') self.parsetype() self.parseplist() Index: Lib/test/test_ssl.py =================================================================== --- Lib/test/test_ssl.py (revision 64003) +++ Lib/test/test_ssl.py (working copy) @@ -944,7 +944,7 @@ url = 'https://%s:%d/%s' % ( HOST, server.port, os.path.split(CERTFILE)[1]) f = urllib.urlopen(url) - dlen = f.info().getheader("content-length") + dlen = f.info().get("content-length") if dlen and (int(dlen) > 0): d2 = f.read(int(dlen)) if support.verbose: