Skip to content

Commit

Permalink
Use static copyright years
Browse files Browse the repository at this point in the history
See python/cpython#126133

Also update LICENSE and README from cpython.
  • Loading branch information
Syeberman committed Nov 27, 2024
1 parent e73d945 commit 63bf483
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 16 deletions.
41 changes: 32 additions & 9 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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.
Expand Down Expand Up @@ -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
--------------------------------------------

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion Lib/yp.py
Original file line number Diff line number Diff line change
@@ -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
"""

Expand Down
2 changes: 1 addition & 1 deletion Lib/ypExamples.c
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion nohtyP.c
Original file line number Diff line number Diff line change
@@ -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
*/

Expand Down
2 changes: 1 addition & 1 deletion nohtyP.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 63bf483

Please sign in to comment.