Skip to content

Commit 253e92b

Browse files
aloisklinkaloisklink
committed
[3.12] pythongh-95649: Document that asyncio contains uvloop code (pythonGH-107536)
Some of the asyncio SSL changes in pythonGH-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]: python#31275 [2]: https://github.com/MagicStack/uvloop/tree/v0.16.0 (cherry picked from commit dce30c9)
1 parent e081792 commit 253e92b

7 files changed

Lines changed: 49 additions & 0 deletions

File tree

‎Doc/license.rst‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,3 +1068,32 @@ The audioop module uses the code base in g771.c file of the SoX project::
10681068
distributed freely. This document may not be included in published
10691069
material or commercial packages without the written consent of its
10701070
author.
1071+
1072+
1073+
asyncio
1074+
----------
1075+
1076+
Parts of the :mod:`asyncio` module are incorporated from
1077+
`uvloop 0.16 <https://github.com/MagicStack/uvloop/tree/v0.16.0>`_,
1078+
which is distributed under the MIT license::
1079+
1080+
Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
1081+
1082+
Permission is hereby granted, free of charge, to any person obtaining
1083+
a copy of this software and associated documentation files (the
1084+
"Software"), to deal in the Software without restriction, including
1085+
without limitation the rights to use, copy, modify, merge, publish,
1086+
distribute, sublicense, and/or sell copies of the Software, and to
1087+
permit persons to whom the Software is furnished to do so, subject to
1088+
the following conditions:
1089+
1090+
The above copyright notice and this permission notice shall be
1091+
included in all copies or substantial portions of the Software.
1092+
1093+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1094+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1095+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1096+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1097+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1098+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1099+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Lib/asyncio/constants.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
2+
# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
3+
# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
4+
15
import enum
26

37
# After the connection is lost, log warnings after this many write()s.

‎Lib/asyncio/events.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
"""Event loop and event loop policy."""
22

3+
# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
4+
# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
5+
# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
6+
37
__all__ = (
48
'AbstractEventLoopPolicy',
59
'AbstractEventLoop', 'AbstractServer',

‎Lib/asyncio/sslproto.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
2+
# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
3+
# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
4+
15
import collections
26
import enum
37
import warnings

‎Lib/test/test_asyncio/test_ssl.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Contains code from https://github.com/MagicStack/uvloop/tree/v0.16.0
2+
# SPDX-License-Identifier: PSF-2.0 AND (MIT OR Apache-2.0)
3+
# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
4+
15
import asyncio
26
import contextlib
37
import gc

‎Misc/ACKS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ Carsten Klein
959959
Bastian Kleineidam
960960
Joel Klimont
961961
Bob Kline
962+
Alois Klink
962963
Matthias Klose
963964
Jeremy Kloth
964965
Thomas Kluyver

‎Misc/NEWS.d/next/Documentation/2023-08-01-13-11-39.gh-issue-95649.F4KhPS.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Document that the :mod:`asyncio` module contains code taken from `v0.16.0 of
2+
the uvloop project <https://github.com/MagicStack/uvloop/tree/v0.16.0>`_, as
3+
well as the required MIT licensing information.

0 commit comments

Comments
 (0)