[Python-checkins] CVS: python/dist/src LICENSE,1.1.2.5,1.1.2.6
Fred L. Drake
python-dev@python.org
Mon, 14 Aug 2000 10:05:12 -0700
Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22858
Modified Files:
Tag: cnri-16-start
LICENSE
Log Message:
Updated version number for the final release.
Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** LICENSE 2000/08/04 21:49:46 1.1.2.5
--- LICENSE 2000/08/14 17:05:10 1.1.2.6
***************
*** 13,22 ****
! B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING Python 1.6, beta 1
1. CNRI LICENSE AGREEMENT
! PYTHON 1.6, beta 1
CNRI OPEN SOURCE LICENSE AGREEMENT
--- 13,22 ----
! B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING Python 1.6
1. CNRI LICENSE AGREEMENT
! PYTHON 1.6
CNRI OPEN SOURCE LICENSE AGREEMENT
***************
*** 26,73 ****
BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING,
! INSTALLING OR OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE
! DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
! AGREEMENT.
1. This LICENSE AGREEMENT is between the Corporation for National
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, beta 1 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.6b1").
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.6b1
alone or in any derivative version, provided, however, that CNRI's
! License Agreement is retained in Python 1.6b1, 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, beta
! 1, 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.6b1 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.6b1.
! 4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
! FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6b1 WILL NOT
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.6b1, OR ANY
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
--- 26,72 ----
BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING,
! INSTALLING OR OTHERWISE USING PYTHON 1.6 SOFTWARE, YOU ARE DEEMED TO
! HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
1. This LICENSE AGREEMENT is between the Corporation for National
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.
! 4. CNRI is making Python 1.6 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
! FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6 WILL NOT
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.
***************
*** 85,90 ****
8. By clicking on the "ACCEPT" button where indicated, or by copying,
! installing or otherwise using Python 1.6b1, Licensee agrees to be
! bound by the terms and conditions of this License Agreement.
ACCEPT
--- 84,89 ----
8. By clicking on the "ACCEPT" button where indicated, or by copying,
! installing or otherwise using Python 1.6, Licensee agrees to be bound
! by the terms and conditions of this License Agreement.
ACCEPT