From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 11 Mar 2011 19:57:11 +0000 (+0100)
Subject: Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
X-Git-Tag: v3.2.1b1~324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=375ff587c2c4a1ba228bdf9a9fb78d9b8f674347;p=python

Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 7278161355..6704f722cf 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 02b192f487..9f7118f8e9 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__)]