From b9da8c1323ce974641dd6e61bffd35a021b1188c Mon Sep 17 00:00:00 2001 From: inpos Date: Mon, 18 Dec 2017 09:04:57 +0300 Subject: [PATCH] py3 support errors --- dtls/patch.py | 2 +- dtls/test/echo_seq.py | 22 +++++++++--------- dtls/test/simple_client.py | 2 +- dtls/test/test_perf.py | 46 +++++++++++++++++++------------------- dtls/test/unit.py | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dtls/patch.py b/dtls/patch.py index 2882c4f..7f83a68 100644 --- a/dtls/patch.py +++ b/dtls/patch.py @@ -170,7 +170,7 @@ def _SSLSocket_init(self, sock=None, keyfile=None, certfile=None, # see if it's connected try: socket.getpeername(self) - except socket_error, e: + except socket_error as e: if e.errno != errno.ENOTCONN: raise # no, no connection yet diff --git a/dtls/test/echo_seq.py b/dtls/test/echo_seq.py index 3be2e35..b70699f 100644 --- a/dtls/test/echo_seq.py +++ b/dtls/test/echo_seq.py @@ -56,13 +56,13 @@ def main(): while True: cnt += 1 - print "Listen invocation: %d" % cnt + print("Listen invocation: %d" % cnt) peer_address = scn.listen() if peer_address: - print "Completed listening for peer: %s" % str(peer_address) + print("Completed listening for peer: %s" % str(peer_address)) break - print "Accepting..." + print("Accepting...") conn = scn.accept()[0] sck.settimeout(5) conn.get_socket(True).settimeout(5) @@ -70,26 +70,26 @@ def main(): cnt = 0 while True: cnt += 1 - print "Listen invocation: %d" % cnt + print("Listen invocation: %d" % cnt) peer_address = scn.listen() assert not peer_address - print "Handshake invocation: %d" % cnt + print("Handshake invocation: %d" % cnt) try: conn.do_handshake() except SSLError as err: if err.errno == 504: continue raise - print "Completed handshaking with peer" + print("Completed handshaking with peer") break cnt = 0 while True: cnt += 1 - print "Listen invocation: %d" % cnt + print("Listen invocation: %d" % cnt) peer_address = scn.listen() assert not peer_address - print "Read invocation: %d" % cnt + print("Read invocation: %d" % cnt) try: message = conn.read() except SSLError as err: @@ -98,16 +98,16 @@ def main(): if err.args[0] == SSL_ERROR_ZERO_RETURN: break raise - print message + print(message) conn.write("Back to you: " + message) cnt = 0 while True: cnt += 1 - print "Listen invocation: %d" % cnt + print("Listen invocation: %d" % cnt) peer_address = scn.listen() assert not peer_address - print "Shutdown invocation: %d" % cnt + print("Shutdown invocation: %d" % cnt) try: s = conn.shutdown() s.shutdown(socket.SHUT_RDWR) diff --git a/dtls/test/simple_client.py b/dtls/test/simple_client.py index c243f20..e4ac782 100644 --- a/dtls/test/simple_client.py +++ b/dtls/test/simple_client.py @@ -10,6 +10,6 @@ cert_path = path.join(path.abspath(path.dirname(__file__)), "certs") sock = ssl.wrap_socket(socket(AF_INET, SOCK_DGRAM), cert_reqs=ssl.CERT_REQUIRED, ca_certs=path.join(cert_path, "ca-cert.pem")) sock.connect(('localhost', 28000)) sock.send('Hi there') -print sock.recv() +print(sock.recv()) sock.unwrap() sock.shutdown(SHUT_RDWR) diff --git a/dtls/test/test_perf.py b/dtls/test/test_perf.py index ef860b4..0219b17 100644 --- a/dtls/test/test_perf.py +++ b/dtls/test/test_perf.py @@ -84,7 +84,7 @@ fill = urandom(CHUNK_SIZE) def transfer_out(sock, listen_sock=None, marker=False): max_i_len = 10 start_char = "t" if marker else "s" - for i in xrange(CHUNKS): + for i in range(CHUNKS): prefix = start_char + str(i) + ":" pad_prefix = prefix + "b" * (max_i_len - len(prefix)) message = pad_prefix + fill[:CHUNK_SIZE - max_i_len - 1] + "e" @@ -106,7 +106,7 @@ def transfer_out(sock, listen_sock=None, marker=False): if not i % CHUNKS_PER_DOT: sys.stdout.write('.') sys.stdout.flush() - print + print() def transfer_in(sock, listen_sock=None): drops = 0 @@ -168,7 +168,7 @@ def transfer_in(sock, listen_sock=None): sys.stdout.flush() i += 1 drops += CHUNKS - 1 - pack_seq - print + print() return drops # @@ -260,7 +260,7 @@ def make_client_manager(): # Create the global client manager class in servers configured as client # managers class ClientManager(object): - from Queue import Queue + from queue import Queue queue = Queue() clients = -1 # creator does not count @@ -324,16 +324,16 @@ def remote_client(manager_address): manager = Manager(manager_address, COMM_KEY) manager.connect() queue = manager.get_queue() - print "Client connected; waiting for job..." + print("Client connected; waiting for job...") while True: command = queue.get() if command == "STOP": break command = command[:-1] + [(manager_address[0], command[-1][1])] - print "Starting job: " + str(command) + print("Starting job: " + str(command)) drops = client(*command) - print "%d drops" % drops - print "Job completed; waiting for next job..." + print("%d drops" % drops) + print("Job completed; waiting for next job...") # # Test runner @@ -349,7 +349,7 @@ def run_test(server_args, client_args, port): # bind to loopback only, for local clients listen_addr = 'localhost', port svr = iter(server(*server_args, listen_addr=listen_addr)) - listen_addr = svr.next() + listen_addr = next(svr) listen_addr = 'localhost', listen_addr[1] client_args = list(client_args) client_args.append(listen_addr) @@ -360,19 +360,19 @@ def run_test(server_args, client_args, port): proc.start() in_size = CHUNK_SIZE * CHUNKS / 2**20 out_size = CHUNK_SIZE * CHUNKS / 2**20 - print "Starting inbound: %dMiB" % in_size - svr_in_time, drops = svr.next() - print "Inbound: %.3f seconds, %dMiB/s, %d drops" % ( - svr_in_time, in_size / svr_in_time, drops) - print "Starting outbound: %dMiB" % out_size - svr_out_time = svr.next() - print "Outbound: %.3f seconds, %dMiB/s" % ( - svr_out_time, out_size / svr_out_time) + print("Starting inbound: %dMiB" % in_size) + svr_in_time, drops = next(svr) + print("Inbound: %.3f seconds, %dMiB/s, %d drops" % ( + svr_in_time, in_size / svr_in_time, drops)) + print("Starting outbound: %dMiB" % out_size) + svr_out_time = next(svr) + print("Outbound: %.3f seconds, %dMiB/s" % ( + svr_out_time, out_size / svr_out_time)) if not QUEUE: proc.join() - print "Combined: %.3f seconds, %dMiB/s" % ( + print("Combined: %.3f seconds, %dMiB/s" % ( svr_out_time + svr_in_time, - (in_size + out_size) / (svr_in_time + svr_out_time)) + (in_size + out_size) / (svr_in_time + svr_out_time))) # # Main entry point @@ -419,16 +419,16 @@ if __name__ == "__main__": } do_patch() while True: - print "\nSelect protocol:\n" + print("\nSelect protocol:\n") for key in sorted(selector): - print "\t" + str(key) + ": " + selector[key] + print("\t" + str(key) + ": " + selector[key]) try: - choice = raw_input("\nProtocol: ") + choice = input("\nProtocol: ") choice = int(choice) if choice < 0 or choice >= len(selector): raise ValueError("Invalid selection input") except (ValueError, OverflowError): - print "Invalid selection input" + print("Invalid selection input") continue except EOFError: break diff --git a/dtls/test/unit.py b/dtls/test/unit.py index 3e21701..f297f43 100644 --- a/dtls/test/unit.py +++ b/dtls/test/unit.py @@ -59,7 +59,7 @@ class BasicTests(unittest.TestCase): # A crude test for the legacy API try: ssl.sslwrap_simple(socket.socket(AF_INET4_6, socket.SOCK_DGRAM)) - except IOError, e: + except IOError as e: if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that pass else: