From ba7a2ab9f09ed7a57c2380e04ade64e7520ef0f4 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 24 May 2019 15:21:00 -0700 Subject: [PATCH] Make simple_http_server.py work on Python 3. --- tools/simple_http_server.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/simple_http_server.py b/tools/simple_http_server.py index 14ac9a3d3..233aa6bd3 100755 --- a/tools/simple_http_server.py +++ b/tools/simple_http_server.py @@ -1,8 +1,11 @@ #!/usr/bin/env python -"""A version of Python 2.x's SimpleHTTPServer that flushes its output.""" -from BaseHTTPServer import HTTPServer -from SimpleHTTPServer import SimpleHTTPRequestHandler +"""A version of Python's SimpleHTTPServer that flushes its output.""" import sys +try: + from http.server import HTTPServer, SimpleHTTPRequestHandler +except ImportError: + from BaseHTTPServer import HTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler def serve_forever(port=0): """Spins up an HTTP server on all interfaces and the given port.