cpython: fe2ca2216334 (original) (raw)

Mercurial > cpython

changeset 103234:fe2ca2216334

Merge: #26209: Clarify type of *localaddr*/*remoteadr* in smtpd docs. [#26209]

R David Murray rdmurray@bitdance.com
date	Wed, 07 Sep 2016 14:02:11 -0400
parents	69da5242aae3(current diff)1ed37f6e91bb(diff)
children	7f4c9cfae20c
files	Doc/library/smtpd.rst Doc/library/socket.rst
diffstat	2 files changed, 6 insertions(+), 3 deletions(-)[+] [-] Doc/library/smtpd.rst 7 Doc/library/socket.rst 2

line wrap: on

line diff

--- a/Doc/library/smtpd.rst +++ b/Doc/library/smtpd.rst @@ -32,9 +32,10 @@ SMTPServer Objects map=None, enable_SMTPUTF8=False, decode_data=False) Create a new :class:SMTPServer object, which binds to local address

localaddr. It will treat remoteaddr as an upstream SMTP relayer. It
inherits from :class:asyncore.dispatcher, and so will insert itself into
:mod:asyncore's event loop on instantiation.

localaddr. It will treat remoteaddr as an upstream SMTP relayer. Both
localaddr and remoteaddr should be a :ref:(host, port) <host_port>
tuple. The object inherits from :class:asyncore.dispatcher, and so will
insert itself into :mod:asyncore's event loop on instantiation. data_size_limit specifies the maximum number of bytes that will be accepted in a DATA command. A value of None or 0 means no

--- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -63,6 +63,8 @@ created. Socket addresses are represent .. versionchanged:: 3.5 Writable :term:bytes-like object is now accepted. +.. _host_port: +

A pair (host, port) is used for the :const:AF_INET address family, where host is a string representing either a hostname in Internet domain notation like 'daring.cwi.nl' or an IPv4 address like '100.50.200.5',