Minor code style improvements in http.server suggested in Issue13294.
This commit is contained in:
parent
83194f5b92
commit
3075549d53
|
@ -271,14 +271,11 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
|
||||||
self.request_version = version = self.default_request_version
|
self.request_version = version = self.default_request_version
|
||||||
self.close_connection = 1
|
self.close_connection = 1
|
||||||
requestline = str(self.raw_requestline, 'iso-8859-1')
|
requestline = str(self.raw_requestline, 'iso-8859-1')
|
||||||
if requestline[-2:] == '\r\n':
|
requestline = requestline.rstrip('\r\n')
|
||||||
requestline = requestline[:-2]
|
|
||||||
elif requestline[-1:] == '\n':
|
|
||||||
requestline = requestline[:-1]
|
|
||||||
self.requestline = requestline
|
self.requestline = requestline
|
||||||
words = requestline.split()
|
words = requestline.split()
|
||||||
if len(words) == 3:
|
if len(words) == 3:
|
||||||
[command, path, version] = words
|
command, path, version = words
|
||||||
if version[:5] != 'HTTP/':
|
if version[:5] != 'HTTP/':
|
||||||
self.send_error(400, "Bad request version (%r)" % version)
|
self.send_error(400, "Bad request version (%r)" % version)
|
||||||
return False
|
return False
|
||||||
|
@ -304,7 +301,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
|
||||||
"Invalid HTTP Version (%s)" % base_version_number)
|
"Invalid HTTP Version (%s)" % base_version_number)
|
||||||
return False
|
return False
|
||||||
elif len(words) == 2:
|
elif len(words) == 2:
|
||||||
[command, path] = words
|
command, path = words
|
||||||
self.close_connection = 1
|
self.close_connection = 1
|
||||||
if command != 'GET':
|
if command != 'GET':
|
||||||
self.send_error(400,
|
self.send_error(400,
|
||||||
|
|
Loading…
Reference in New Issue