From 375ff587c2c4a1ba228bdf9a9fb78d9b8f674347 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 11 Mar 2011 20:57:11 +0100 Subject: [PATCH] Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. --- Misc/NEWS | 5 +++++ Tools/ccbench/ccbench.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 72781613550..6704f722cfc 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -81,6 +81,11 @@ Build - Issue #11268: Prevent Mac OS X Installer failure if Documentation package had previously been installed. +Tools/Demos +----------- + +- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. + Tests ----- diff --git a/Tools/ccbench/ccbench.py b/Tools/ccbench/ccbench.py index 02b192f4877..9f7118f8e97 100644 --- a/Tools/ccbench/ccbench.py +++ b/Tools/ccbench/ccbench.py @@ -276,7 +276,8 @@ def _recv(sock, n): return sock.recv(n).decode('ascii') def latency_client(addr, nb_pings, interval): - with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + try: _time = time.time _sleep = time.sleep def _ping(): @@ -289,6 +290,8 @@ def latency_client(addr, nb_pings, interval): _sleep(interval) _ping() _sendto(sock, LAT_END + "\n", addr) + finally: + sock.close() def run_latency_client(**kwargs): cmd_line = [sys.executable, '-E', os.path.abspath(__file__)]