Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
diff --git a/Misc/NEWS b/Misc/NEWS
index 7278161..6704f72 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,11 @@
- 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 02b192f..9f7118f 100644
--- a/Tools/ccbench/ccbench.py
+++ b/Tools/ccbench/ccbench.py
@@ -276,7 +276,8 @@
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 @@
_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__)]