Merge from 3.4

This commit is contained in:
Tim Golden 2015-04-08 16:53:21 +01:00
commit da5cbe65ae

View file

@ -31,7 +31,7 @@ Character), EL (Erase Line), GA (Go Ahead), SB (Subnegotiation Begin).
:class:`Telnet` represents a connection to a Telnet server. The instance is :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 initially not connected by default; the :meth:`open` method must be used to
establish a connection. Alternatively, the host name and optional port establish a connection. Alternatively, the host name and optional port
number can be passed to the constructor, to, in which case the connection to number can be passed to the constructor too, 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 *timeout* parameter specifies a timeout in seconds for blocking operations
like the connection attempt (if not specified, the global default timeout like the connection attempt (if not specified, the global default timeout