Skip to content

Commit 4b7beed

Browse files
committed
Document that asyncio contains uvloop code
Some of the asyncio SSL changes in GH-31275 were taken from [v0.16.0 of the uvloop project][1]. In order to comply with the MIT license, we need to just need to document the copyright information. [1]: https://github.com/MagicStack/uvloop/tree/v0.16.0
1 parent fcb3c2a commit 4b7beed

File tree

7 files changed

+49
-0
lines changed

7 files changed

+49
-0
lines changed

Doc/license.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,3 +1066,32 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
10661066
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
10671067
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
10681068
SOFTWARE.
1069+
1070+
1071+
asyncio
1072+
----------
1073+
1074+
Parts of the :mod:`asyncio` module are incorporated from
1075+
`uvloop 0.16 <https://github.com/MagicStack/uvloop/tree/v0.16.0>`_,
1076+
which is distributed under the MIT license::
1077+
1078+
Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
1079+
1080+
Permission is hereby granted, free of charge, to any person obtaining
1081+
a copy of this software and associated documentation files (the
1082+
"Software"), to deal in the Software without restriction, including
1083+
without limitation the rights to use, copy, modify, merge, publish,
1084+
distribute, sublicense, and/or sell copies of the Software, and to
1085+
permit persons to whom the Software is furnished to do so, subject to
1086+
the following conditions:
1087+
1088+
The above copyright notice and this permission notice shall be
1089+
included in all copies or substantial portions of the Software.
1090+
1091+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1092+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1093+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1094+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1095+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1096+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1097+
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
@@ -963,6 +963,7 @@ Carsten Klein
963963
Bastian Kleineidam
964964
Joel Klimont
965965
Bob Kline
966+
Alois Klink
966967
Matthias Klose
967968
Jeremy Kloth
968969
Thomas Kluyver
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)