diff options
Diffstat (limited to 'test/functional/util/dummy_https.py')
| -rwxr-xr-x | test/functional/util/dummy_https.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/test/functional/util/dummy_https.py b/test/functional/util/dummy_https.py index 43c5d9122..1e6753423 100755 --- a/test/functional/util/dummy_https.py +++ b/test/functional/util/dummy_https.py @@ -1,15 +1,15 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 -import BaseHTTPServer -import SocketServer -import SimpleHTTPServer -import dummy_killer -import ssl - -import time +import http.server +import http.server import os -import sys import socket +import socketserver +import ssl +import sys +import time + +import dummy_killer PORT = 18081 HOST_NAME = '127.0.0.1' @@ -17,10 +17,10 @@ HOST_NAME = '127.0.0.1' PID = "/tmp/dummy_https.pid" -class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): +class MyHandler(http.server.BaseHTTPRequestHandler): def setup(self): - BaseHTTPServer.BaseHTTPRequestHandler.setup(self) + http.server.BaseHTTPRequestHandler.setup(self) self.protocol_version = "HTTP/1.1" # allow connection: keep-alive def do_HEAD(self): @@ -30,7 +30,7 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.log_message("to be closed: " + self.close_connection) def do_GET(self): - response = "hello world" + response = b"hello world" """Respond to a GET request.""" if self.path == "/empty": @@ -64,11 +64,11 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): """Respond to a POST request.""" content_length = int(self.headers['Content-Length']) - response = 'hello post' + response = b'hello post' if content_length > 0: body = self.rfile.read(content_length) - response = "hello post: " + str(len(body)) + response = b"hello post: " + bytes(len(body)) if self.path == "/empty": self.finish() @@ -90,13 +90,13 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.wfile.write(response) -class ThreadingSimpleServer(SocketServer.ThreadingMixIn, - BaseHTTPServer.HTTPServer): +class ThreadingSimpleServer(socketserver.ThreadingMixIn, + http.server.HTTPServer): def __init__(self, certfile, keyfile,): self.allow_reuse_address = True self.timeout = 10 - BaseHTTPServer.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler) + http.server.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler) self.socket = ssl.wrap_socket (self.socket, keyfile=keyfile, certfile=certfile, server_side=True) @@ -108,9 +108,9 @@ class ThreadingSimpleServer(SocketServer.ThreadingMixIn, sys.stdout.flush() server.handle_request() except KeyboardInterrupt: - print "Interrupt" + print("Interrupt") except socket.error: - print "Socket closed" + print("Socket closed") def stop(self): self.keep_running = False |