summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlois Klink <alois@aloisklink.com>2024-01-14 02:14:51 (GMT)
committerGitHub <noreply@github.com>2024-01-14 02:14:51 (GMT)
commit0d12a64eafd22ed28d0764c9c89f82229a87818c (patch)
treef08f7c686455d3528e91ab0955a58c6f35ac8e37
parent41edd371606109e93ce9d73c053109085f740d1b (diff)
downloadcpython-0d12a64eafd22ed28d0764c9c89f82229a87818c.zip
cpython-0d12a64eafd22ed28d0764c9c89f82229a87818c.tar.gz
cpython-0d12a64eafd22ed28d0764c9c89f82229a87818c.tar.bz2
[3.11] gh-95649: Document that asyncio contains uvloop code (GH-107536) (#114045)
Some of the asyncio SSL changes in GH-31275 [1] were taken from v0.16.0 of the uvloop project [2]. In order to comply with the MIT license, we need to just need to document the copyright information. [1]: https://github.com/python/cpython/pull/31275 [2]: https://github.com/MagicStack/uvloop/tree/v0.16.0 (cherry picked from commit dce30c9cbc212e5455e100f35ac6afeb30dfd23e)
-rw-r--r--Doc/license.rst29
-rw-r--r--Lib/asyncio/constants.py4
-rw-r--r--Lib/asyncio/events.py4
-rw-r--r--Lib/asyncio/sslproto.py4
-rw-r--r--Lib/test/test_asyncio/test_ssl.py4
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Documentation/2023-08-01-13-11-39.gh-issue-95649.F4KhPS.rst3
7 files changed, 49 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 6644df6..7ad296f 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -1064,3 +1064,32 @@ The audioop module uses the code base in g771.c file of the SoX project::
distributed freely. This document may not be included in published
material or commercial packages without the written consent of its
author.
+
+
+asyncio
+----------
+
+Parts of the :mod:`asyncio` module are incorporated from
+`uvloop 0.16 <https://github.com/MagicStack/uvloop/tree/v0.16.0>`_,
+which is distributed under the MIT license::
+
+ Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Lib/asyncio/constants.py b/Lib/asyncio/constants.py
index f171ead..0ad997a 100644
--- a/Lib/asyncio/constants.py
+++ b/Lib/asyncio/constants.py
@@ -1,3 +1,7 @@
+# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
+# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
+# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
+
import enum
# After the connection is lost, log warnings after this many write()s.
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 5fe4074..cfc6215 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -1,5 +1,9 @@
"""Event loop and event loop policy."""
+# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
+# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
+# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
+
__all__ = (
'AbstractEventLoopPolicy',
'AbstractEventLoop', 'AbstractServer',
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index 1966cd7..4d2cf82 100644
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -1,3 +1,7 @@
+# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
+# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
+# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
+
import collections
import enum
import warnings
diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py
index aaf3c37..17602b2 100644
--- a/Lib/test/test_asyncio/test_ssl.py
+++ b/Lib/test/test_asyncio/test_ssl.py
@@ -1,3 +1,7 @@
+# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
+# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
+# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
+
import asyncio
import asyncio.sslproto
import contextlib
diff --git a/Misc/ACKS b/Misc/ACKS
index e7e4bb0..45a5a9b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -944,6 +944,7 @@ Carsten Klein
Bastian Kleineidam
Joel Klimont
Bob Kline
+Alois Klink
Matthias Klose
Jeremy Kloth
Thomas Kluyver
diff --git a/Misc/NEWS.d/next/Documentation/2023-08-01-13-11-39.gh-issue-95649.F4KhPS.rst b/Misc/NEWS.d/next/Documentation/2023-08-01-13-11-39.gh-issue-95649.F4KhPS.rst
new file mode 100644
index 0000000..d2c9486
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2023-08-01-13-11-39.gh-issue-95649.F4KhPS.rst
@@ -0,0 +1,3 @@
+Document that the :mod:`asyncio` module contains code taken from `v0.16.0 of
+the uvloop project <https://github.com/MagicStack/uvloop/tree/v0.16.0>`_, as
+well as the required MIT licensing information.