traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from 3.2. Minor code style improvements in http.server suggested in Issue13294.

This commit is contained in:
Senthil Kumaran 2011-12-23 17:04:23 +08:00
parent 19d2d08014 3075549d53
commit d22983d081
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/http/server.py
View File

@ -272,14 +272,11 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
self.request_version = version = self.default_request_version
self.close_connection = 1
requestline = str(self.raw_requestline, 'iso-8859-1')
if requestline[-2:] == '\r\n':
requestline = requestline[:-2]
elif requestline[-1:] == '\n':
requestline = requestline[:-1]
requestline = requestline.rstrip('\r\n')
self.requestline = requestline
words = requestline.split()
if len(words) == 3:
[command, path, version] = words
command, path, version = words
if version[:5] != 'HTTP/':
self.send_error(400, "Bad request version (%r)" % version)
return False
@ -305,7 +302,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
"Invalid HTTP Version (%s)" % base_version_number)
return False
elif len(words) == 2:
[command, path] = words
command, path = words
self.close_connection = 1
if command != 'GET':
self.send_error(400,