diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-12-23 09:04:23 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-12-23 09:04:23 (GMT) |
| commit | d22983d081845009e894dced4c4d835f18755520 (patch) | |
| tree | af261ee99571144596790d088fbf914b5e241048 /Lib/http | |
| parent | 19d2d0801461c83639d6c1a045668a8a3d051f13 (diff) | |
| parent | 3075549d537cc5e25a11efeae013663b4ad91b8f (diff) | |
| download | cpython-d22983d081845009e894dced4c4d835f18755520.zip cpython-d22983d081845009e894dced4c4d835f18755520.tar.gz cpython-d22983d081845009e894dced4c4d835f18755520.tar.bz2 | |
merge from 3.2. Minor code style improvements in http.server suggested in Issue13294.
Diffstat (limited to 'Lib/http')
| -rw-r--r-- | Lib/http/server.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index b79d191..78fbcda 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -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, |