[Python-checkins] python/dist/src LICENSE,1.23,1.24 README,1.161,1.162

Mon, 30 Dec 2002 17:50:09 -0800

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22204

Modified Files:
	LICENSE README 
Log Message:
Various updates to the version number, on the eve of the 2.3a1 release.

Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** LICENSE	6 Oct 2002 04:04:45 -0000	1.23
--- LICENSE	31 Dec 2002 01:50:07 -0000	1.24
***************
*** 42,45 ****
--- 42,46 ----
      2.2.1           2.2         2002        PSF         yes
      2.2.2           2.2.1       2002        PSF         yes
+     2.3             2.2.2       2002-2003   PSF         yes

  Footnotes:
***************
*** 63,72 ****
  ===============================================================

! PSF LICENSE AGREEMENT FOR PYTHON 2.2
  ------------------------------------

  1. This LICENSE AGREEMENT is between the Python Software Foundation
  ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using Python 2.2 software in source or binary form and its
  associated documentation.

--- 64,73 ----
  ===============================================================

! 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.

***************
*** 74,100 ****
  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.2
  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 Python Software Foundation; All Rights Reserved" are
! retained in Python 2.2 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.2 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.2.

! 4. PSF is making Python 2.2 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.2 WILL NOT
  INFRINGE ANY THIRD PARTY RIGHTS.

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

--- 75,101 ----
  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 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.

***************
*** 108,112 ****
  products or services of Licensee, or any third party.

! 8. By copying, installing or otherwise using Python 2.2, Licensee
  agrees to be bound by the terms and conditions of this License
  Agreement.
--- 109,113 ----
  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.

Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/README,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** README	19 Dec 2002 16:21:46 -0000	1.161
--- README	31 Dec 2002 01:50:07 -0000	1.162
***************
*** 1,6 ****
! This is Python version 2.3 (pre-alpha)
! ==========================

! Copyright (c) 2001, 2002 Python Software Foundation.
  All rights reserved.

--- 1,6 ----
! This is Python version 2.3 alpha 1
! ==================================

! Copyright (c) 2001, 2002, 2003 Python Software Foundation.
  All rights reserved.