Coding style improvements

python · lyc8503 · May 11, 2024 · May 23, 2024 · May 23, 2024 · May 23, 2024
commit 1ca0ff7a875854277a8bae134f1437d64153801d
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -684,7 +684,7 @@ def do_GET(self):
         f = self.send_head()
         if f:
             try:
-                self.copyfile(f, self.wfile, range=self.range)
+                self.copyfile(f, self.wfile, range=self._range)
             finally:
                 f.close()
 
@@ -707,7 +707,7 @@ def send_head(self):
         """
         path = self.translate_path(self.path)
         f = None
-        self.range = self.parse_range()
+        self._range = self.parse_range()
         if os.path.isdir(path):
             parts = urllib.parse.urlsplit(self.path)
             if not parts.path.endswith('/'):
@@ -772,14 +772,16 @@ def send_head(self):
                             f.close()
                             return None
 
-            if self.range:
-                start, end = self.range
+            if self._range:
+                start, end = self._range
                 if start is None:
                     # `end` here means suffix length
                     start = max(0, fs.st_size - end)
                     end = fs.st_size - 1
                 if start >= fs.st_size:
-                    # 416 REQUESTED_RANGE_NOT_SATISFIABLE means that none of the range values overlap the extent of the resource
+                    # 416 REQUESTED_RANGE_NOT_SATISFIABLE means that
+                    # none of the range values overlap the extent of
+                    # the resource
                     f.close()
                     self.send_error(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
                     return None
@@ -790,11 +792,11 @@ def send_head(self):
                 self.send_header("Content-Length", str(end - start + 1))
 
                 # Update range to be sent to be used later in copyfile
-                self.range = (start, end)
+                self._range = (start, end)
             else:
                 self.send_response(HTTPStatus.OK)
                 self.send_header("Accept-Ranges", "bytes")
-                self.send_header("Content-Length", str(fs[6]))
+                self.send_header("Content-Length", str(fs.st_size))
             self.send_header("Content-type", ctype)
             self.send_header("Last-Modified",
                 self.date_time_string(fs.st_mtime))
@@ -956,10 +958,10 @@ def parse_range(self):
 
         """
         range_header = self.headers.get('range')
-        if not range_header:
+        if range_header is None:
             return None
         m = RANGE_REGEX_PATTERN.match(range_header)
-        if not m:
+        if m is None:
             return None
 
         start = int(m.group(1)) if m.group(1) else None

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -540,48 +540,49 @@ def test_get(self):
                 os.chmod(self.tempdir, 0o755)
 
     def test_range_get(self):
-        response = self.request(self.base_url + '/test')
+        route = self.base_url + '/test'
+        response = self.request(route)
         self.assertEqual(response.getheader('accept-ranges'), 'bytes')
         self.check_status_and_reason(response, HTTPStatus.OK, data=self.data)
 
         # valid ranges
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=3-12'})
+        response = self.request(route, headers={'Range': 'bytes=3-12'})
         self.assertEqual(response.getheader('content-range'), 'bytes 3-12/30')
         self.assertEqual(response.getheader('content-length'), '10')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[3:13])
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=3-'})
+        response = self.request(route, headers={'Range': 'bytes=3-'})
         self.assertEqual(response.getheader('content-range'), 'bytes 3-29/30')
         self.assertEqual(response.getheader('content-length'), '27')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[3:])
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=-5'})
+        response = self.request(route, headers={'Range': 'bytes=-5'})
         self.assertEqual(response.getheader('content-range'), 'bytes 25-29/30')
         self.assertEqual(response.getheader('content-length'), '5')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[25:])
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=29-29'})
+        response = self.request(route, headers={'Range': 'bytes=29-29'})
         self.assertEqual(response.getheader('content-range'), 'bytes 29-29/30')
         self.assertEqual(response.getheader('content-length'), '1')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[29:])
 
         # end > file size
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=25-100'})
+        response = self.request(route, headers={'Range': 'bytes=25-100'})
         self.assertEqual(response.getheader('content-range'), 'bytes 25-29/30')
         self.assertEqual(response.getheader('content-length'), '5')
         self.check_status_and_reason(response, HTTPStatus.PARTIAL_CONTENT, data=self.data[25:])
 
         # invalid ranges
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=100-200'})
+        response = self.request(route, headers={'Range': 'bytes=100-200'})
         self.check_status_and_reason(response, HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=4-3'})
+        response = self.request(route, headers={'Range': 'bytes=4-3'})
         self.check_status_and_reason(response, HTTPStatus.OK, data=self.data)
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=wrong format'})
+        response = self.request(route, headers={'Range': 'bytes=wrong format'})
         self.check_status_and_reason(response, HTTPStatus.OK, data=self.data)
 
-        response = self.request(self.base_url + '/test', headers={'Range': 'bytes=-'})
+        response = self.request(route, headers={'Range': 'bytes=-'})
         self.check_status_and_reason(response, HTTPStatus.OK, data=self.data)
 
     def test_head(self):

diff --git a/Misc/NEWS.d/next/Library/2024-05-12-00-15-44.gh-issue-86809._5vdGa.rst b/Misc/NEWS.d/next/Library/2024-05-12-00-15-44.gh-issue-86809._5vdGa.rst
@@ -1 +1,2 @@
-Add support for HTTP Range header in ``SimpleHTTPServer``
+Add support for HTTP Range header in :class:`SimpleHTTPServer`. Add an optional
+``range`` paramater to :func:`SimpleHTTPRequestHandler.copyfile`.