From aed60d85e09b9156a2d701d71330f45d5caf340a Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Sun, 5 Mar 2017 04:26:49 -0800 Subject: [PATCH 1/4] Provide socket.TCP_NOTSENT_LOWAT New TCP option available on recent MacOS and Linux. --- Modules/socketmodule.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 63e87e6e4867ee..6d5c256ff340d6 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -7507,6 +7507,9 @@ PyInit__socket(void) #ifdef TCP_USER_TIMEOUT PyModule_AddIntMacro(m, TCP_USER_TIMEOUT); #endif +#ifdef TCP_NOTSENT_LOWAT + PyModule_AddIntMacro(m, TCP_NOTSENT_LOWAT); +#endif /* IPX options */ #ifdef IPX_TYPE From 30cba0592f5badaa373fe09b31c97b17801de510 Mon Sep 17 00:00:00 2001 From: "Nathaniel J. Smith" Date: Sun, 5 Mar 2017 11:07:08 -0800 Subject: [PATCH 2/4] Document addition of TCP_NOTSENT_LOWAT --- Doc/library/socket.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index d56caf0a5829c5..5d7418dc12cb59 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -302,6 +302,9 @@ Constants .. versionchanged:: 3.6 ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``, ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added. + + .. versionchanged:: 3.7 + ``TCP_NOTSENT_LOWAT`` was added. .. data:: AF_CAN PF_CAN From f3ef9ee44ec9eca911f5e4029fe8494dbc437c2b Mon Sep 17 00:00:00 2001 From: Mariatta Date: Thu, 16 Mar 2017 20:27:38 -0700 Subject: [PATCH 3/4] remove trailing whitespace in socket.rst --- Doc/library/socket.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 5d7418dc12cb59..8af6bc5439beea 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -302,7 +302,7 @@ Constants .. versionchanged:: 3.6 ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``, ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added. - + .. versionchanged:: 3.7 ``TCP_NOTSENT_LOWAT`` was added. From bb240814870316528216b0dd4ab344d079b195a1 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Thu, 16 Mar 2017 20:36:41 -0700 Subject: [PATCH 4/4] Add the entry in Misc/NEWS --- Misc/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index b7990c62e4f744..32c2a66040f2ad 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -309,6 +309,9 @@ Library - bpo-28682: Added support for bytes paths in os.fwalk(). +- bpo-29728: Add new :data:`socket.TCP_NOTSENT_LOWAT` (Linux 3.12) constant. + Patch by Nathaniel J. Smith. + - bpo-29623: Allow use of path-like object as a single argument in ConfigParser.read(). Patch by David Ellis.