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.
........
This commit is contained in:
Christian Heimes 2008-02-25 13:19:43 +00:00
parent 23daade028
commit dcca98d483
3 changed files with 5 additions and 5 deletions

View file

@ -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.