[Python-checkins] CVS: python/dist/src LICENSE,1.12,1.13

Guido van Rossum gvanrossum@users.sourceforge.net
Fri, 13 Apr 2001 08:04:02 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv13708

Modified Files:
	LICENSE 
Log Message:
- Inserted the (tentative) PSF license.

- Removed the subsection numbering in section B (each time a new
  license is inserted in the front, the others have to be renumbered).

- Changed the words in the intro to avoid implying that 1.6.1 is
  GPL-compatible.


Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** LICENSE	2001/04/10 03:37:31	1.12
--- LICENSE	2001/04/13 15:04:00	1.13
***************
*** 20,26 ****
  Foundation (FSF) interacted to develop enabling wording changes to the
  Python license.  Python 1.6.1 is essentially the same as Python 1.6,
! with a few minor bug fixes, and with a GPL compatible open source
! license.  Python 2.1 is a derivative work of Python 1.6.1, as well as
! of Python 2.0.
  
  After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
--- 20,26 ----
  Foundation (FSF) interacted to develop enabling wording changes to the
  Python license.  Python 1.6.1 is essentially the same as Python 1.6,
! with a few minor bug fixes, and with a different license that enables
! later versions to be GPL-compatible.  Python 2.1 is a derivative work
! of Python 1.6.1, as well as of Python 2.0.
  
  After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
***************
*** 39,45 ****
  ===============================================================
  
! B.1. BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0
! ---------------------------------------------------
  
  BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
  
--- 39,100 ----
  ===============================================================
  
! PSF LICENSE AGREEMENT
! ---------------------
  
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using Python 2.1 software in source or binary form and its
+ associated documentation.
+ 
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby 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 2.1
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001 Python Software Foundation; All Rights Reserved" are retained in
+ Python 2.1 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 2.1 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python 2.1.
+ 
+ 4. PSF is making Python 2.1 available to Licensee on an "AS IS"
+ basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1 WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ 
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ 2.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ 
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ 
+ 7. This License Agreement shall be governed by the federal
+ intellectual property law of the United States, including without
+ limitation the federal copyright law, and, to the extent such
+ U.S. federal law does not apply, by the law of the Commonwealth of
+ Virginia, excluding Virginia's conflict of law provisions.
+ Notwithstanding the foregoing, with regard to derivative works based
+ on Python 2.1 that incorporate non-separable material that was
+ previously distributed under the GNU General Public License (GPL), the
+ law of the Commonwealth of Virginia shall govern this License
+ Agreement only as to issues arising under or with respect to
+ Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+ License Agreement shall be deemed to create any relationship of
+ agency, partnership, or joint venture between PSF and Licensee.  This
+ License Agreement does not grant permission to use PSF trademarks or
+ trade name in a trademark sense to endorse or promote products or
+ services of Licensee, or any third party.
+ 
+ BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0
+ ----------------------------------------------
+ 
  BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
  
***************
*** 89,94 ****
  
  
! B.2. CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT
! ------------------------------------------------------
  
  1. This LICENSE AGREEMENT is between the Corporation for National
--- 144,149 ----
  
  
! CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT
! -------------------------------------------------
  
  1. This LICENSE AGREEMENT is between the Corporation for National
***************
*** 160,165 ****
  
  
! B.3. CWI PERMISSIONS STATEMENT AND DISCLAIMER
! ---------------------------------------------
  
  Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
--- 215,220 ----
  
  
! CWI PERMISSIONS STATEMENT AND DISCLAIMER
! ----------------------------------------
  
  Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,