Merged revisions 81435 via svnmerge from

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

................
  r81435 | georg.brandl | 2010-05-21 23:33:23 +0200 (Fr, 21 Mai 2010) | 9 lines

  Merged revisions 81431 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81431 | georg.brandl | 2010-05-21 23:30:47 +0200 (Fr, 21 Mai 2010) | 1 line

    #8707: remove duplicate paragraph part.
  ........
................
This commit is contained in:
Georg Brandl 2010-05-21 21:33:56 +00:00
parent 32af78717c
commit c7afb62cb8
1 changed files with 3 additions and 8 deletions

View File

@ -27,16 +27,11 @@ Character), EL (Erase Line), GA (Go Ahead), SB (Subnegotiation Begin).
:class:`Telnet` represents a connection to a Telnet server. The instance is
initially not connected by default; the :meth:`open` method must be used to
establish a connection. Alternatively, the host name and optional port
and timeout can be passed to the constructor, in which case the connection to
the server will be established before the constructor returns. The optional
*timeout* parameter specifies a timeout in seconds for the connection attempt (if
not specified, the global default timeout setting will be used).
number can be passed to the constructor, to, in which case the connection to
the server will be established before the constructor returns. The optional
the server will be established before the constructor returns. The optional
*timeout* parameter specifies a timeout in seconds for blocking operations
like the connection attempt (if not specified, or passed as None, the global
default timeout setting will be used).
like the connection attempt (if not specified, the global default timeout
setting will be used).
Do not reopen an already connected instance.