From 8ccf43bce93b17db62748b9f4b4838b90630ab23 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Fri, 28 Feb 2020 15:25:17 +1000 Subject: [PATCH] admin/serve-doc: Switch to python3 only Signed-off-by: Brad Hubbard --- admin/serve-doc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/admin/serve-doc b/admin/serve-doc index 96da048e5871..fa2805938208 100755 --- a/admin/serve-doc +++ b/admin/serve-doc @@ -1,8 +1,9 @@ -#!/usr/bin/python +#!/usr/bin/python3 + from __future__ import print_function -import SimpleHTTPServer -import SocketServer +import http.server +import socketserver import os import sys @@ -11,7 +12,7 @@ os.chdir(path) os.chdir('..') os.chdir('build-doc/output/html') -class ReusingTCPServer(SimpleHTTPServer.SimpleHTTPRequestHandler): +class ReusingTCPServer(http.server.SimpleHTTPRequestHandler): allow_reuse_address = True def send_head(self): @@ -19,9 +20,9 @@ class ReusingTCPServer(SimpleHTTPServer.SimpleHTTPRequestHandler): # slash-redirecting of requests with query arguments, and will # redirect to /foo?q=bar/ -- wrong slash placement self.path = self.path.split('?', 1)[0] - return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self) + return http.server.SimpleHTTPRequestHandler.send_head(self) -httpd = SocketServer.TCPServer( +httpd = socketserver.TCPServer( ("", 8080), ReusingTCPServer, ) -- 2.47.3