[Python-checkins] python/dist/src LICENSE,1.29,1.30

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8769

Modified Files:
	LICENSE 
Log Message:
license updates for 2.4 (cleared with tim, on behalf of the psf)

Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** LICENSE	11 May 2004 18:13:09 -0000	1.29
--- LICENSE	8 Jul 2004 05:57:59 -0000	1.30
***************
*** 48,51 ****
--- 48,52 ----
      2.3.3           2.3.2       2002-2003   PSF         yes
      2.3.4           2.3.3       2004        PSF         yes
+     2.4             2.3         2004        PSF         yes
  
  Footnotes:
***************
*** 69,78 ****
  ===============================================================
  
! PSF LICENSE AGREEMENT FOR PYTHON 2.3
  ------------------------------------
  
  1. This LICENSE AGREEMENT is between the Python Software Foundation
  ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using Python 2.3 software in source or binary form and its
  associated documentation.
  
--- 70,79 ----
  ===============================================================
  
! PSF LICENSE AGREEMENT FOR PYTHON 2.4
  ------------------------------------
  
  1. This LICENSE AGREEMENT is between the Python Software Foundation
  ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using Python 2.4 software in source or binary form and its
  associated documentation.
  
***************
*** 80,106 ****
  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.3
  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 Python Software Foundation; All Rights Reserved"
! are retained in Python 2.3 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.3 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.3.
  
! 4. PSF is making Python 2.3 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.3 WILL NOT
  INFRINGE ANY THIRD PARTY RIGHTS.
  
  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
  OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
  
--- 81,107 ----
  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.4
  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 Python Software Foundation; All Rights Reserved"
! are retained in Python 2.4 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.4 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.4.
  
! 4. PSF is making Python 2.4 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.4 WILL NOT
  INFRINGE ANY THIRD PARTY RIGHTS.
  
  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4,
  OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
  
***************
*** 114,118 ****
  products or services of Licensee, or any third party.
  
! 8. By copying, installing or otherwise using Python 2.3, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
--- 115,119 ----
  products or services of Licensee, or any third party.
  
! 8. By copying, installing or otherwise using Python 2.4, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.