Skip to content

Commit efa45b0

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 557b05c commit efa45b0

File tree

7 files changed

+47
-0
lines changed

7 files changed

+47
-0
lines changed

Doc/license.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,3 +1040,30 @@ https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the
10401040
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
10411041
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
10421042
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1043+
1044+
1045+
asyncio
1046+
----------
1047+
1048+
The :mod:`asyncio` module contains the following notice::
1049+
1050+
Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
1051+
1052+
Permission is hereby granted, free of charge, to any person obtaining
1053+
a copy of this software and associated documentation files (the
1054+
"Software"), to deal in the Software without restriction, including
1055+
without limitation the rights to use, copy, modify, merge, publish,
1056+
distribute, sublicense, and/or sell copies of the Software, and to
1057+
permit persons to whom the Software is furnished to do so, subject to
1058+
the following conditions:
1059+
1060+
The above copyright notice and this permission notice shall be
1061+
included in all copies or substantial portions of the Software.
1062+
1063+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1064+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1065+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1066+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1067+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1068+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1069+
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
@@ -957,6 +957,7 @@ Carsten Klein
957957
Bastian Kleineidam
958958
Joel Klimont
959959
Bob Kline
960+
Alois Klink
960961
Matthias Klose
961962
Jeremy Kloth
962963
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)