From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 23 Dec 2011 09:07:13 +0000 (+0800)
Subject: port to 2.7 - Minor code style improvements in http.server suggested in Issue13294.
X-Git-Tag: v2.7.3rc1~218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=139c457106b0230b3a0e16d4865f0d195c9c6014;p=thirdparty%2FPython%2Fcpython.git

port to 2.7 - Minor code style improvements in http.server suggested in Issue13294.
---

diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index da043150af85..1a39485e161b 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -244,14 +244,11 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
         self.request_version = version = self.default_request_version
         self.close_connection = 1
         requestline = self.raw_requestline
-        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
@@ -277,7 +274,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,