[Python-checkins] CVS: python/dist/src LICENSE,1.1.2.6,1.1.2.7

Fri, 1 Sep 2000 13:04:27 -0700

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27867

Modified Files:
      Tag: cnri-16-start
	LICENSE 
Log Message:
New 1.6 license text as Kahn currently wants it.  I'm just checking
this in so I can get it off my TO-DO list; I won't release 1.6 final
until the license is approved by the FSF as GPL-compatible.

Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** LICENSE	2000/08/14 17:05:10	1.1.2.6
--- LICENSE	2000/09/01 20:04:23	1.1.2.7
***************
*** 16,26 ****

! 1. CNRI LICENSE AGREEMENT 

-         PYTHON 1.6

-         CNRI OPEN SOURCE LICENSE AGREEMENT
- 
- 
  IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.

--- 16,22 ----

! 1. CNRI OPEN SOURCE LICENSE AGREEMENT

  IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.

***************
*** 32,60 ****
  Research Initiatives, having an office at 1895 Preston White Drive,
  Reston, VA 20191 ("CNRI"), and the Individual or Organization
! ("Licensee") accessing and otherwise using Python 1.6 software
! in source or binary form and its associated documentation, as released
! at the www.python.org Internet site on August 4, 2000 ("Python
! 1.6").

  2. Subject to the terms and conditions of this License Agreement, CNRI
! hereby grants Licensee a non-exclusive, royalty-free, world-wide
  license to reproduce, analyze, test, perform and/or display publicly,
  prepare derivative works, distribute, and otherwise use Python 1.6
  alone or in any derivative version, provided, however, that CNRI's
! License Agreement is retained in Python 1.6, alone or in any
! derivative version prepared by Licensee.

  Alternately, in lieu of CNRI's License Agreement, Licensee may
! substitute the following text (omitting the quotes): "Python 1.6, is
  made available subject to the terms and conditions in CNRI's License
! Agreement.  This Agreement may be located on the Internet using the
! following unique, persistent identifier (known as a handle):
! 1895.22/1011.  This Agreement may also be obtained from a proxy server
! on the Internet using the URL:http://hdl.handle.net/1895.22/1011".

  3. In the event Licensee prepares a derivative work that is based on
! or incorporates Python 1.6 or any part thereof, and wants to make
! the derivative work available to the public as provided herein, then
! Licensee hereby agrees to indicate in any such work the nature of the
  modifications made to Python 1.6.

--- 28,58 ----
  Research Initiatives, having an office at 1895 Preston White Drive,
  Reston, VA 20191 ("CNRI"), and the Individual or Organization
! ("Licensee") accessing and otherwise using Python 1.6 software in
! source or binary form and its associated documentation, as released at
! the www.python.org Internet site on <date TBD> ("Python 1.6").

  2. Subject to the terms and conditions of this License Agreement, CNRI
! 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 1.6
  alone or in any derivative version, provided, however, that CNRI's
! License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
! 1995-2000 Corporation for National Research Initiatives; All Rights
! Reserved" are retained in Python 1.6 alone or in any derivative
! version prepared by Licensee.

  Alternately, in lieu of CNRI's License Agreement, Licensee may
! substitute the following text (omitting the quotes): "Python 1.6 is
  made available subject to the terms and conditions in CNRI's License
! Agreement.  This Agreement together with Python 1.6 may be located on
! the Internet using the following unique, persistent identifier (known
! as a handle): 1895.22/1012.  This Agreement may also be obtained from a
! proxy server on the Internet using the following URL:
! http://hdl.handle.net/1895.22/1012".

  3. In the event Licensee prepares a derivative work that is based on
! or incorporates Python 1.6 or any part thereof, and wants to make the
! derivative work available to others as provided herein, then Licensee
! hereby agrees to indicate in any such work the nature of the
  modifications made to Python 1.6.

***************
*** 66,73 ****
  INFRINGE ANY THIRD PARTY RIGHTS.

! 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
! SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
! AS A RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6, OR ANY
! DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.

  6. This License Agreement will automatically terminate upon a material
--- 64,71 ----
  INFRINGE ANY THIRD PARTY RIGHTS.

! 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 1.6 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
! RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6, OR
! ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.

  6. This License Agreement will automatically terminate upon a material