traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use a proxy method, so the user does not have to override the original behaviour

This commit is contained in:
Mikkel Juul 2020-11-20 10:37:47 +01:00
parent e13a3ea449
commit 064f6e1f12
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Lib/http/server.py
View File

@ -855,7 +855,10 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
def directory_body(self, list_of_files, displaypath, actual_path, enc) -> str:
"""
Compose and encode the list_of_files into HTML
Compose the list_of_files into body content
This method is a proxy method, to enable using the original
method when overriding the behaviour of the Handler
displaypath is a relative path str
actual_path is the full actual filesystem path
@ -879,21 +882,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
print("Serving at port", PORT)
httpd.serve_forever()
"""
r = []
title = 'Directory listing for %s' % displaypath
r.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '
'"http://www.w3.org/TR/html4/strict.dtd">')
r.append('<html>\n<head>')
r.append('<meta http-equiv="Content-Type" '
'content="text/html; charset=%s">' % enc)
r.append('<title>%s</title>\n</head>' % title)
r.append('<body>\n<h1>%s</h1>' % title)
r.append('<hr>\n<ul>')
for name in list_of_files:
r.append('<li><a href="%s">%s</a></li>'
% self.link_and_display_name(actual_path, name))
r.append('</ul>\n<hr>\n</body>\n</html>\n')
return '\n'.join(r)
return self.directory_body_html(list_of_files, displaypath, actual_path, enc)
def send_directory_headers(self, enc, content_length):
"""
@ -944,6 +933,23 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
errors='surrogatepass'),
html.escape(displayname, quote=False))
def directory_body_html(self, list_of_files, displaypath, actual_path, enc):
r = []
title = 'Directory listing for %s' % displaypath
r.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '
'"http://www.w3.org/TR/html4/strict.dtd">')
r.append('<html>\n<head>')
r.append('<meta http-equiv="Content-Type" '
'content="text/html; charset=%s">' % enc)
r.append('<title>%s</title>\n</head>' % title)
r.append('<body>\n<h1>%s</h1>' % title)
r.append('<hr>\n<ul>')
for name in list_of_files:
r.append('<li><a href="%s">%s</a></li>'
% self.link_and_display_name(actual_path, name))
r.append('</ul>\n<hr>\n</body>\n</html>\n')
return '\n'.join(r)
# Utilities for CGIHTTPRequestHandler