diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
| commit | 824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70 (patch) | |
| tree | 1dd1a1f8864bb4ea4da86e403e0a0c3a4b74c14d /Lib/http/server.py | |
| parent | a8fef3700df5400004ac88fa20c8bb4ff6f44ca3 (diff) | |
| parent | fd20eca68b680d81b45ec4ce421d1d942dd29c1b (diff) | |
| download | cpython-824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70.tar.gz | |
#11565: Merge with 3.2.
Diffstat (limited to 'Lib/http/server.py')
| -rw-r--r-- | Lib/http/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index 543abe0c9f..a35fd9d6ee 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -448,7 +448,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): message = '' if self.request_version != 'HTTP/0.9': self.wfile.write(("%s %d %s\r\n" % - (self.protocol_version, code, message)).encode('latin1', 'strict')) + (self.protocol_version, code, message)).encode('latin-1', 'strict')) def send_header(self, keyword, value): """Send a MIME header.""" @@ -456,7 +456,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): if not hasattr(self, '_headers_buffer'): self._headers_buffer = [] self._headers_buffer.append( - ("%s: %s\r\n" % (keyword, value)).encode('latin1', 'strict')) + ("%s: %s\r\n" % (keyword, value)).encode('latin-1', 'strict')) if keyword.lower() == 'connection': if value.lower() == 'close': |