Merge branch 'master' of https://github.com/certbot/certbot

1 files changed, 7 insertions, 3 deletions

diff --git a/tools/simple_http_server.py b/tools/simple_http_server.py
index 14ac9a3d3..24c55962d 100755
--- a/tools/simple_http_server.py
+++ b/tools/simple_http_server.py
@@ -1,9 +1,13 @@
 #!/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.