From 63bf48382c0314549d8b126ddbaddac9b693d373 Mon Sep 17 00:00:00 2001 From: Sye van der Veen Date: Tue, 26 Nov 2024 19:17:54 -0500 Subject: [PATCH] Use static copyright years See https://github.com/python/cpython/issues/126133 Also update LICENSE and README from cpython. --- LICENSE.txt | 41 ++++++++++++++++++++++++++++++++--------- Lib/yp.py | 2 +- Lib/ypExamples.c | 2 +- README.md | 6 +++--- nohtyP.c | 2 +- nohtyP.h | 2 +- 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 66a3ac80..20cf3909 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,12 +2,12 @@ A. HISTORY OF THE SOFTWARE ========================== Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others. In 1995, Guido continued his work on Python at the Corporation for -National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +National Research Initiatives (CNRI, see https://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software. @@ -19,7 +19,7 @@ https://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation was a sponsoring member of the PSF. -All Python releases are Open Source (see http://www.opensource.org for +All Python releases are Open Source (see https://opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases. @@ -59,6 +59,17 @@ direction to make these releases possible. B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON =============================================================== +Python software and documentation are licensed under the +Python Software Foundation License Version 2. + +Starting with Python 3.8.6, examples, recipes, and other code in +the documentation are dual licensed under the PSF License Version 2 +and the Zero-Clause BSD license. + +Some software incorporated into Python is under different licenses. +The licenses are listed with code falling under that license. + + PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 -------------------------------------------- @@ -72,10 +83,8 @@ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, -i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation; -All Rights Reserved" are retained in Python alone or in any derivative version -prepared by Licensee. +i.e., "Copyright (c) 2001 Python Software Foundation; All Rights Reserved" +are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make @@ -180,9 +189,9 @@ version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following +Python 1.6.1 may be located on the internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet +Agreement may also be obtained from a proxy server on the internet using the following URL: http://hdl.handle.net/1895.22/1013". 3. In the event Licensee prepares a derivative work that is based on @@ -252,3 +261,17 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION +---------------------------------------------------------------------- + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/Lib/yp.py b/Lib/yp.py index f9dbbb39..da4e67e8 100644 --- a/Lib/yp.py +++ b/Lib/yp.py @@ -1,7 +1,7 @@ """ yp.py - Python wrapper for nohtyP https://github.com/Syeberman/nohtyP [v0.1.0 $Change$] - Copyright (c) 2001-2020 Python Software Foundation; All Rights Reserved + Copyright (c) 2001 Python Software Foundation; All Rights Reserved License: http://docs.python.org/3/license.html """ diff --git a/Lib/ypExamples.c b/Lib/ypExamples.c index 997c7624..47181446 100644 --- a/Lib/ypExamples.c +++ b/Lib/ypExamples.c @@ -1,7 +1,7 @@ /* * ypExamples.c - Contains a number of nohtyP examples * https://github.com/Syeberman/nohtyP [v0.1.0 $Change$] - * Copyright (c) 2001-2020 Python Software Foundation; All Rights Reserved + * Copyright (c) 2001 Python Software Foundation; All Rights Reserved * License: http://docs.python.org/3/license.html */ diff --git a/README.md b/README.md index ec3ac984..409fa62c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ This is nohtyP version 0.5.0 ============================ -Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. +Copyright (c) 2001 Python Software Foundation. All rights reserved. nohtyP is a pure-C implementation of the Python 3.x built-in library. It is implemented in one .c and one .h file for easy embedding in C projects. The API is designed to compensate for C's @@ -76,7 +76,7 @@ Copyright and License Information As a derivative work of Python, nohtyP shares the same copyrights and licenses. -Copyright (c) 2001-2020 Python Software Foundation. All rights reserved. +Copyright (c) 2001 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. @@ -90,7 +90,7 @@ usage, and a DISCLAIMER OF ALL WARRANTIES. nohtyP is patterned after, and contains source from, Python 2.7 and above. nohtyP has always been released under a Python Software Foundation (PSF) license. Source taken from Python comes from distributions containing *no* GNU General Public License (GPL) code. As such, nohtyP may be used in -proprietary projects. +proprietary projects. There are interfaces to some GNU code but these are entirely optional. All trademarks referenced herein are property of their respective holders. diff --git a/nohtyP.c b/nohtyP.c index bb22c801..0cfe4a57 100644 --- a/nohtyP.c +++ b/nohtyP.c @@ -1,7 +1,7 @@ /* * nohtyP.c - A Python-like API for C, in one .c and one .h * https://github.com/Syeberman/nohtyP [v0.1.0 $Change$] - * Copyright (c) 2001-2020 Python Software Foundation; All Rights Reserved + * Copyright (c) 2001 Python Software Foundation; All Rights Reserved * License: http://docs.python.org/3/license.html */ diff --git a/nohtyP.h b/nohtyP.h index 0dc70db5..e3d92b08 100644 --- a/nohtyP.h +++ b/nohtyP.h @@ -2,7 +2,7 @@ * nohtyP.h - A Python-like API for C, in one .c and one .h * * https://github.com/Syeberman/nohtyP [v0.1.0 $Change$] - * Copyright (c) 2001-2020 Python Software Foundation; All Rights Reserved + * Copyright (c) 2001 Python Software Foundation; All Rights Reserved * License: http://docs.python.org/3/license.html * * The goal of nohtyP is to enable Python-like code to be written in C. It is patterned after