Merged revisions 81418 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r81418 | georg.brandl | 2010-05-21 22:57:33 +0200 (Fr, 21 Mai 2010) | 9 lines

  Recorded merge of revisions 81415 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81415 | georg.brandl | 2010-05-21 22:52:46 +0200 (Fr, 21 Mai 2010) | 1 line

    typo
  ........
................
This commit is contained in:
Georg Brandl 2010-05-21 21:01:43 +00:00
parent ced2f2d9f9
commit 1bb061d0a5
1 changed files with 1 additions and 1 deletions

View File

@ -604,7 +604,7 @@ OpenerDirector Objects
method on the currently installed global :class:`OpenerDirector`). The method on the currently installed global :class:`OpenerDirector`). The
optional *timeout* parameter specifies a timeout in seconds for blocking optional *timeout* parameter specifies a timeout in seconds for blocking
operations like the connection attempt (if not specified, the global default operations like the connection attempt (if not specified, the global default
timeout setting will be usedi). The timeout feature actually works only for timeout setting will be used). The timeout feature actually works only for
HTTP, HTTPS, FTP and FTPS connections). HTTP, HTTPS, FTP and FTPS connections).