Skip to content

Commit

Permalink
[3.12] pythongh-95649: Document that asyncio contains uvloop code (py…
Browse files Browse the repository at this point in the history
…thonGH-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)

Co-authored-by: Alois Klink <alois@aloisklink.com>
  • Loading branch information
aloisklink committed Jan 14, 2024
1 parent e081792 commit 5fc1d7f
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 0 deletions.
29 changes: 29 additions & 0 deletions Doc/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1068,3 +1068,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.
4 changes: 4 additions & 0 deletions Lib/asyncio/constants.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 4 additions & 0 deletions Lib/asyncio/events.py
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
4 changes: 4 additions & 0 deletions Lib/asyncio/sslproto.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_asyncio/test_ssl.py
Original file line number Diff line number Diff line change
@@ -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 contextlib
import gc
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ Carsten Klein
Bastian Kleineidam
Joel Klimont
Bob Kline
Alois Klink
Matthias Klose
Jeremy Kloth
Thomas Kluyver
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 5fc1d7f

Please sign in to comment.