[Python-checkins] CVS: python/dist/src LICENSE,1.1.2.10,1.1.2.11
Guido van Rossum
gvanrossum@users.sourceforge.net
Fri, 23 Feb 2001 06:42:32 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv23553
Modified Files:
Tag: cnri-16-start
LICENSE
Log Message:
New 1.6.1 license from CNRI.
Editorial nits: added extra space between sentences in intro where
needed, and changed ambiguous subheadings "1" and "2" into "B.1" and
"B.2".
Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -r1.1.2.10 -r1.1.2.11
*** LICENSE 2001/02/23 14:17:25 1.1.2.10
--- LICENSE 2001/02/23 14:42:29 1.1.2.11
***************
*** 15,21 ****
CNRI to work with commercial software developers, it became clear that
the ability to use Python with software available under the GNU Public
! License (GPL) was very desirable. CNRI and the Free Software
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.
--- 15,21 ----
CNRI to work with commercial software developers, it became clear that
the ability to use Python with software available under the GNU Public
! License (GPL) was very desirable. CNRI and the Free Software
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.
***************
*** 23,97 ****
! B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING Python 1.6
! 1. CNRI OPEN SOURCE LICENSE AGREEMENT
-
- IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
- 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 September 5, 2000 ("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 include in any such work a brief summary of the
! changes 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 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
breach of its terms and conditions.
! 7. This License Agreement shall be governed by and interpreted in all
! respects by the law of the State of Virginia, excluding conflict of
! law provisions. Nothing in this License Agreement shall be deemed to
! create any relationship of agency, partnership, or joint venture
! between CNRI and Licensee. This License Agreement does not grant
! permission to use CNRI trademarks or trade name in a trademark sense
! to endorse or promote products or services of Licensee, or any third
! party.
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
--- 23,95 ----
! B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING Python 1.6.1
! B.1. CNRI OPEN SOURCE GPL-COMPATIBLE 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.1 software in
! source or binary form and its associated documentation.
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.1
alone or in any derivative version, provided, however, that CNRI's
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
! 1995-2001 Corporation for National Research Initiatives; All Rights
! Reserved" are retained in Python 1.6.1 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.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
! unique, persistent identifier (known as a handle): 1895.22/1013. This
! 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
! or incorporates Python 1.6.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 1.6.1.
! 4. CNRI is making Python 1.6.1 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.1 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.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 1.6.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 CNRI and Licensee. This
! License Agreement does not grant permission to use CNRI trademarks or
! trade name in a trademark sense to endorse or promote products or
! services of Licensee, or any third party.
8. By clicking on the "ACCEPT" button where indicated, or by copying,
! installing or otherwise using Python 1.6.1, Licensee agrees to be
! bound by the terms and conditions of this License Agreement.
ACCEPT
***************
*** 99,103 ****
! 2. CWI PERMISSIONS STATEMENT AND DISCLAIMER
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
--- 97,101 ----
! B.2. CWI PERMISSIONS STATEMENT AND DISCLAIMER
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,