Merge pull request #66 from cclauss/patch-1

Use print() function in both Python 2 and Python 3
This commit is contained in:
Swissky 2019-04-27 01:02:09 +02:00 committed by GitHub
commit d0f14cbfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
from __future__ import print_function
import socket,ssl import socket,ssl
from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer from BaseHTTPServer import BaseHTTPRequestHandler,HTTPServer
from websocket import create_connection, WebSocket from websocket import create_connection, WebSocket
@ -9,7 +10,7 @@ import os
LOOP_BACK_PORT_NUMBER = 8000 LOOP_BACK_PORT_NUMBER = 8000
def FuzzWebSocket(fuzz_value): def FuzzWebSocket(fuzz_value):
print fuzz_value print(fuzz_value)
ws.send(ws_message.replace("[FUZZ]", str(fuzz_value[0]))) ws.send(ws_message.replace("[FUZZ]", str(fuzz_value[0])))
result = ws.recv() result = ws.recv()
return result return result
@ -22,7 +23,7 @@ def LoadMessage(file):
file_contents = f.read() file_contents = f.read()
f.close() f.close()
except: except:
print ("Error reading file: %s" % file) print("Error reading file: %s" % file)
exit() exit()
return file_contents return file_contents
@ -52,12 +53,12 @@ try:
#Create a web server and define the handler to manage the #Create a web server and define the handler to manage the
#incoming request #incoming request
server = HTTPServer(('', LOOP_BACK_PORT_NUMBER), myWebServer) server = HTTPServer(('', LOOP_BACK_PORT_NUMBER), myWebServer)
print 'Started httpserver on port ' , LOOP_BACK_PORT_NUMBER print('Started httpserver on port ' , LOOP_BACK_PORT_NUMBER)
#Wait forever for incoming http requests #Wait forever for incoming http requests
server.serve_forever() server.serve_forever()
except KeyboardInterrupt: except KeyboardInterrupt:
print '^C received, shutting down the web server' print('^C received, shutting down the web server')
server.socket.close() server.socket.close()
ws.close() ws.close()