summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_smtplib.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-06-11 19:14:14 (GMT)
commit672b8031a803fa420cac91cdaab02130c1f8bed0 (patch)
treecff73aa339853806887dd85bf1df34f088532efe /Lib/test/test_smtplib.py
parent559e5d7f4d1155e95fb6f925c927a263f9196935 (diff)
downloadcpython-672b8031a803fa420cac91cdaab02130c1f8bed0.zip
cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.gz
cpython-672b8031a803fa420cac91cdaab02130c1f8bed0.tar.bz2
Merged revisions 64125 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64125 | benjamin.peterson | 2008-06-11 12:27:50 -0500 (Wed, 11 Jun 2008) | 2 lines give the threading API PEP 8 names ........
Diffstat (limited to 'Lib/test/test_smtplib.py')
-rw-r--r--Lib/test/test_smtplib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 8130252..3f3ba6b 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -109,7 +109,7 @@ def debugging_server(serv, serv_evt, client_evt):
# when the client conversation is finished, it will
# set client_evt, and it's then ok to kill the server
- if client_evt.isSet():
+ if client_evt.is_set():
serv.close()
break
@@ -118,7 +118,7 @@ def debugging_server(serv, serv_evt, client_evt):
except socket.timeout:
pass
finally:
- if not client_evt.isSet():
+ if not client_evt.is_set():
# allow some time for the client to read the result
time.sleep(0.5)
serv.close()