summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-02-25 13:19:43 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-02-25 13:19:43 (GMT)
commitdcca98d483f8a86c187c4d72f2e220a56ed0a1c0 (patch)
tree0e15f7a9733e30f544e8922470f317fb7a0dccb3 /Lib
parent23daade028eca9287f7072a6af26871f99088fe9 (diff)
downloadcpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.zip
cpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.tar.gz
cpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.tar.bz2
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61058-61061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61058 | neal.norwitz | 2008-02-25 02:45:37 +0100 (Mon, 25 Feb 2008) | 1 line Fix indentation ........ r61059 | brett.cannon | 2008-02-25 06:33:07 +0100 (Mon, 25 Feb 2008) | 2 lines Add minor markup for a string. ........ r61060 | brett.cannon | 2008-02-25 06:33:33 +0100 (Mon, 25 Feb 2008) | 2 lines Fix a minor typo in a docstring. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 4bc6619..f9ed396 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -105,7 +105,7 @@ def requires(resource, msg=None):
def bind_port(sock, host='', preferred_port=54321):
"""Try to bind the sock to a port. If we are running multiple
- tests and we don't try multiple ports, the test can fails. This
+ tests and we don't try multiple ports, the test can fail. This
makes the test more robust."""
# Find some random ports that hopefully no one is listening on.