From e780ebb17aeadc137ed3a722eec9571057608729 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Thu, 6 Oct 2016 15:45:11 -0500 Subject: [PATCH] Fix httpd.py test script for Py3 compatibility With these changes the script still works on Python 2.6/2.7. --- testing/scripts/httpd.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testing/scripts/httpd.py b/testing/scripts/httpd.py index feafa70d56..3576f09d1a 100755 --- a/testing/scripts/httpd.py +++ b/testing/scripts/httpd.py @@ -1,7 +1,11 @@ #! /usr/bin/env python -import BaseHTTPServer - +try: + # Python 2 + import BaseHTTPServer +except ImportError: + # Python 3 + import http.server as BaseHTTPServer class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): @@ -11,9 +15,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.end_headers() if "/empty" in self.path: - self.wfile.write("") + self.wfile.write(b"") else: - self.wfile.write("It works!") + self.wfile.write(b"It works!") def do_POST(self): self.send_response(200) @@ -21,9 +25,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.end_headers() if "/empty" in self.path: - self.wfile.write("") + self.wfile.write(b"") else: - self.wfile.write("It works!") + self.wfile.write(b"It works!") def version_string(self): return "1.0"