Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Lib/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,8 @@ def log_message(self, format, *args):

"""
message = (format % args).translate(self._control_char_table)
t = _colorize.get_theme(tty_file=sys.stderr).http_server
stderr = sys.stderr
t = _colorize.get_theme(tty_file=stderr).http_server

info = getattr(self, "_log_request_info", None)
if info is not None:
Expand All @@ -672,7 +673,9 @@ def log_message(self, format, *args):
self._log_is_error = False
message = f"{t.error}{message}{t.reset}"

sys.stderr.write(
if stderr is None:
return
stderr.write(
f"{t.timestamp}{self.address_string()} - - "
f"[{self.log_date_time_string()}]{t.reset} "
f"{message}\n"
Expand Down
18 changes: 18 additions & 0 deletions Lib/test/test_httpservers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,24 @@ def verify_http_server_response(self, response):
match = self.HTTPResponseMatch.search(response)
self.assertIsNotNone(match)

@force_not_colorized
def test_request_without_stderr(self):
self.handler.client_address = ('127.0.0.1', 1337)
log_message = BaseHTTPRequestHandler.log_message.__get__(self.handler)
with mock.patch.object(self.handler, 'log_message', log_message):
for method, status in ((b'GET', b'200 OK'),
(b'UNKNOWN', b'501 Unsupported method')):
with self.subTest(method=method):
with mock.patch.object(sys, 'stderr', None):
result = self.send_typical_request(
method + b' / HTTP/1.1\r\n\r\n')
self.assertIn(status, result[0])
self.assertIsNone(self.handler._log_request_info)
self.assertFalse(getattr(self.handler, '_log_is_error', False))
with support.captured_stderr() as stderr:
self.handler.log_message('logging restored')
self.assertEndsWith(stderr.getvalue(), 'logging restored\n')

@force_not_colorized
def test_unprintable_not_logged(self):
# We call the method from the class directly as our Socketless
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :class:`http.server.BaseHTTPRequestHandler` failing to send responses
when :data:`sys.stderr` is ``None``, for example when running with ``pythonw``.
Loading