Skip to content

Commit e223d06

Browse files
authoredSep 3, 2020
bpo-39883: Use BSD0 license for code in docs (GH-17635)
The PSF board approved this use.
1 parent be435ae commit e223d06

File tree

3 files changed

+60
-0
lines changed

3 files changed

+60
-0
lines changed
 

‎Doc/license.rst

+34
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,19 @@ make these releases possible.
7272
Terms and conditions for accessing or otherwise using Python
7373
============================================================
7474

75+
Python software and documentation are licensed under the
76+
:ref:`PSF License Agreement <PSF-license>`.
77+
78+
Starting with Python 3.8.6, examples, recipes, and other code in
79+
the documentation are dual licensed under the PSF License Agreement
80+
and the :ref:`Zero-Clause BSD license <BSD0>`.
81+
82+
Some software incorporated into Python is under different licenses.
83+
The licenses are listed with code falling under that license.
84+
See :ref:`OtherLicenses` for an incomplete list of these licenses.
85+
86+
87+
.. _PSF-license:
7588

7689
PSF LICENSE AGREEMENT FOR PYTHON |release|
7790
------------------------------------------
@@ -258,6 +271,27 @@ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
258271
SOFTWARE.
259272
260273
274+
.. _BSD0:
275+
276+
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION
277+
----------------------------------------------------------------------
278+
279+
.. parsed-literal::
280+
281+
Permission to use, copy, modify, and/or distribute this software for any
282+
purpose with or without fee is hereby granted.
283+
284+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
285+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
286+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
287+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
288+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
289+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
290+
PERFORMANCE OF THIS SOFTWARE.
291+
292+
293+
.. _OtherLicenses:
294+
261295
Licenses and Acknowledgements for Incorporated Software
262296
=======================================================
263297

‎LICENSE

+25
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

@@ -252,3 +263,17 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
252263
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.
266+
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.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Make code, examples, and recipes in the Python documentation be licensed under the more permissive BSD0 license in addition to the existing Python 2.0 license.

0 commit comments

Comments
 (0)