Skip to content

Commit d49f2e6

Browse files
authored
Update SimpleHTTPSServer.py
Add __main__ and clean up imports for python2 and 3
1 parent d2cbbb6 commit d49f2e6

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

SimpleWebSocketServer/SimpleHTTPSServer.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,21 @@
33
Copyright (c) 2013 Dave P.
44
'''
55

6-
import BaseHTTPServer, SimpleHTTPServer
76
import ssl
87

9-
# openssl req -new -x509 -days 365 -nodes -out cert.pem -keyout cert.pem
10-
httpd = BaseHTTPServer.HTTPServer(('', 443), SimpleHTTPServer.SimpleHTTPRequestHandler)
11-
httpd.socket = ssl.wrap_socket(httpd.socket, server_side=True, certfile='./cert.pem', keyfile='./cert.pem', ssl_version=ssl.PROTOCOL_TLSv1)
12-
httpd.serve_forever()
8+
try:
9+
from BaseHTTPServer import HTTPServer
10+
except:
11+
from http.server import HTTPServer
12+
13+
try:
14+
from SimpleHTTPServer import SimpleHTTPRequestHandler
15+
except:
16+
from http.server import SimpleHTTPRequestHandler
17+
18+
if __name__ == "__main__":
19+
# openssl req -new -x509 -days 365 -nodes -out cert.pem -keyout key.pem
20+
httpd = BaseHTTPServer.HTTPServer(('', 443), SimpleHTTPServer.SimpleHTTPRequestHandler)
21+
httpd.socket = ssl.wrap_socket(httpd.socket, server_side=True, certfile='./cert.pem',
22+
keyfile='./key.pem', ssl_version=ssl.PROTOCOL_TLSv1)
23+
httpd.serve_forever()

0 commit comments

Comments
 (0)