From 17633c0660e92f9a33c2b0e9c38f3beb1ab27a51 Mon Sep 17 00:00:00 2001 From: simudream Date: Fri, 30 Jan 2015 12:09:12 -0800 Subject: [PATCH 1/4] Update ping.py added python 3 support for exceptions and print() --- ping.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ping.py b/ping.py index 73400fa..5fc712b 100644 --- a/ping.py +++ b/ping.py @@ -29,7 +29,10 @@ Revision history ~~~~~~~~~~~~~~~~ - + January 30 2015 + changes by Paul Hope: + - added python 3 support for exceptions and print() + March 11, 2010 changes by Samuel Stauffer: - replaced time.clock with default_timer which is set to @@ -176,7 +179,7 @@ def do_one(dest_addr, timeout): icmp = socket.getprotobyname("icmp") try: my_socket = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp) - except socket.error, (errno, msg): + except socket.error as (errno, msg): if errno == 1: # Operation not permitted msg = msg + ( @@ -200,20 +203,20 @@ def verbose_ping(dest_addr, timeout = 2, count = 4): Send >count< ping to >dest_addr< with the given >timeout< and display the result. """ - for i in xrange(count): - print "ping %s..." % dest_addr, + for i in range(count): + print( "ping %s..." % dest_addr,) try: delay = do_one(dest_addr, timeout) - except socket.gaierror, e: - print "failed. (socket error: '%s')" % e[1] + except socket.gaierror as e: + print("failed. (socket error: '%s')" % e[1]) break if delay == None: - print "failed. (timeout within %ssec.)" % timeout + print("failed. (timeout within %ssec.)" % timeout) else: delay = delay * 1000 - print "get ping in %0.4fms" % delay - print + print("get ping in %0.4fms" % delay) + print('\n') if __name__ == '__main__': From 14edd1ce1f9262450b32daab8b6eb92a1d60d7c4 Mon Sep 17 00:00:00 2001 From: simudream Date: Fri, 30 Jan 2015 12:14:22 -0800 Subject: [PATCH 2/4] Update ping.py changed xrange() to python 3 range() --- ping.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ping.py b/ping.py index 5fc712b..45ccbf2 100644 --- a/ping.py +++ b/ping.py @@ -32,6 +32,7 @@ January 30 2015 changes by Paul Hope: - added python 3 support for exceptions and print() + - changed xrange() to python 3 range() March 11, 2010 changes by Samuel Stauffer: From fcb24de1b95e7430506e143407335bc18ebfb730 Mon Sep 17 00:00:00 2001 From: simudream Date: Fri, 30 Jan 2015 12:21:49 -0800 Subject: [PATCH 3/4] Update ping.py updated print('') --- ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ping.py b/ping.py index 45ccbf2..e0fc699 100644 --- a/ping.py +++ b/ping.py @@ -217,7 +217,7 @@ def verbose_ping(dest_addr, timeout = 2, count = 4): else: delay = delay * 1000 print("get ping in %0.4fms" % delay) - print('\n') + print('') if __name__ == '__main__': From 5bcb71ee2698d09271df3dbc7dfda924b29c6275 Mon Sep 17 00:00:00 2001 From: simudream Date: Fri, 30 Jan 2015 13:07:25 -0800 Subject: [PATCH 4/4] Update ping.py socket.error is deprecated --- ping.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ping.py b/ping.py index e0fc699..b333d9e 100644 --- a/ping.py +++ b/ping.py @@ -33,7 +33,7 @@ changes by Paul Hope: - added python 3 support for exceptions and print() - changed xrange() to python 3 range() - + March 11, 2010 changes by Samuel Stauffer: - replaced time.clock with default_timer which is set to @@ -180,14 +180,14 @@ def do_one(dest_addr, timeout): icmp = socket.getprotobyname("icmp") try: my_socket = socket.socket(socket.AF_INET, socket.SOCK_RAW, icmp) - except socket.error as (errno, msg): - if errno == 1: + except OSError as e: + if e.errno == 1: # Operation not permitted - msg = msg + ( + msg = str(e) + str( " - Note that ICMP messages can only be sent from processes" " running as root." ) - raise socket.error(msg) + raise OSError(msg) raise # raise the original error my_ID = os.getpid() & 0xFFFF