diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-11 19:58:31 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-11 19:58:31 (GMT) |
| commit | f5f6288bbca8b49b19232d2618ff000b4cb586d1 (patch) | |
| tree | 598745115aab45075431a22845e5229decc519da | |
| parent | 3b1eb1a7aad038c4e0f8260fcb73f849c1f44364 (diff) | |
| parent | 375ff587c2c4a1ba228bdf9a9fb78d9b8f674347 (diff) | |
| download | cpython-f5f6288bbca8b49b19232d2618ff000b4cb586d1.zip cpython-f5f6288bbca8b49b19232d2618ff000b4cb586d1.tar.gz cpython-f5f6288bbca8b49b19232d2618ff000b4cb586d1.tar.bz2 | |
Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Tools/ccbench/ccbench.py | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -169,6 +169,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 02b192f..9f7118f 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__)] |