Skip to content

Commit 2b22695

Browse files
committed
license: synchronize CPython license
The CPython license is a little out of date. Let's synchronize it.
1 parent 2b425ad commit 2b22695

File tree

1 file changed

+64
-4
lines changed

1 file changed

+64
-4
lines changed

LICENSE.cpython.txt

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,17 @@ direction to make these releases possible.
5959
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
6060
===============================================================
6161

62+
Python software and documentation are licensed under the
63+
Python Software Foundation License Version 2.
64+
65+
Starting with Python 3.8.6, examples, recipes, and other code in
66+
the documentation are dual licensed under the PSF License Version 2
67+
and the Zero-Clause BSD license.
68+
69+
Some software incorporated into Python is under different licenses.
70+
The licenses are listed with code falling under that license.
71+
72+
6273
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
6374
--------------------------------------------
6475

@@ -73,7 +84,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
7384
distribute, and otherwise use Python alone or in any derivative version,
7485
provided, however, that PSF's License Agreement and PSF's notice of copyright,
7586
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
76-
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation;
87+
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation;
7788
All Rights Reserved" are retained in Python alone or in any derivative version
7889
prepared by Licensee.
7990

@@ -180,9 +191,9 @@ version prepared by Licensee. Alternately, in lieu of CNRI's License
180191
Agreement, Licensee may substitute the following text (omitting the
181192
quotes): "Python 1.6.1 is made available subject to the terms and
182193
conditions in CNRI's License Agreement. This Agreement together with
183-
Python 1.6.1 may be located on the Internet using the following
194+
Python 1.6.1 may be located on the internet using the following
184195
unique, persistent identifier (known as a handle): 1895.22/1013. This
185-
Agreement may also be obtained from a proxy server on the Internet
196+
Agreement may also be obtained from a proxy server on the internet
186197
using the following URL: http://hdl.handle.net/1895.22/1013".
187198

188199
3. In the event Licensee prepares a derivative work that is based on
@@ -253,6 +264,19 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
253264
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
254265
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
255266

267+
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
268+
----------------------------------------------------------------------
269+
270+
Permission to use, copy, modify, and/or distribute this software for any
271+
purpose with or without fee is hereby granted.
272+
273+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
274+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
275+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
276+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
277+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
278+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
279+
PERFORMANCE OF THIS SOFTWARE.
256280

257281
Licenses and Acknowledgements for Incorporated Software
258282
=======================================================
@@ -556,7 +580,7 @@ SipHash24
556580
---------
557581

558582
The file :file:`Python/pyhash.c` contains Marek Majkowski' implementation of
559-
Dan Bernstein's SipHash24 algorithm. The contains the following note::
583+
Dan Bernstein's SipHash24 algorithm. It contains the following note::
560584

561585
<MIT License>
562586
Copyright (c) 2013 Marek Majkowski <[email protected]>
@@ -709,3 +733,39 @@ library unless the build is configured ``--with-system-libmpdec``::
709733
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
710734
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
711735
SUCH DAMAGE.
736+
737+
W3C C14N test suite
738+
-------------------
739+
740+
The C14N 2.0 test suite in the :mod:`test` package
741+
(``Lib/test/xmltestdata/c14n-20/``) was retrieved from the W3C website at
742+
https://www.w3.org/TR/xml-c14n2-testcases/ and is distributed under the
743+
3-clause BSD license::
744+
745+
Copyright (c) 2013 W3C(R) (MIT, ERCIM, Keio, Beihang),
746+
All Rights Reserved.
747+
748+
Redistribution and use in source and binary forms, with or without
749+
modification, are permitted provided that the following conditions
750+
are met:
751+
752+
* Redistributions of works must retain the original copyright notice,
753+
this list of conditions and the following disclaimer.
754+
* Redistributions in binary form must reproduce the original copyright
755+
notice, this list of conditions and the following disclaimer in the
756+
documentation and/or other materials provided with the distribution.
757+
* Neither the name of the W3C nor the names of its contributors may be
758+
used to endorse or promote products derived from this work without
759+
specific prior written permission.
760+
761+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
762+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
763+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
764+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
765+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
766+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
767+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
768+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
769+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
770+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
771+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)