mirror of
https://github.com/python/cpython.git
synced 2024-11-24 02:15:30 +08:00
Various updates to the version number, on the eve of the 2.3a1 release.
This commit is contained in:
parent
974ab9d865
commit
f122688b3f
@ -26,7 +26,7 @@
|
|||||||
#define PY_RELEASE_SERIAL 1
|
#define PY_RELEASE_SERIAL 1
|
||||||
|
|
||||||
/* Version as a string */
|
/* Version as a string */
|
||||||
#define PY_VERSION "2.3a0"
|
#define PY_VERSION "2.3a1"
|
||||||
|
|
||||||
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
|
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
|
||||||
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
|
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
|
||||||
|
23
LICENSE
23
LICENSE
@ -41,6 +41,7 @@ the various releases.
|
|||||||
2.1.3 2.1.2 2002 PSF yes
|
2.1.3 2.1.2 2002 PSF yes
|
||||||
2.2.1 2.2 2002 PSF yes
|
2.2.1 2.2 2002 PSF yes
|
||||||
2.2.2 2.2.1 2002 PSF yes
|
2.2.2 2.2.1 2002 PSF yes
|
||||||
|
2.3 2.2.2 2002-2003 PSF yes
|
||||||
|
|
||||||
Footnotes:
|
Footnotes:
|
||||||
|
|
||||||
@ -62,40 +63,40 @@ direction to make these releases possible.
|
|||||||
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
|
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
|
||||||
===============================================================
|
===============================================================
|
||||||
|
|
||||||
PSF LICENSE AGREEMENT FOR PYTHON 2.2
|
PSF LICENSE AGREEMENT FOR PYTHON 2.3
|
||||||
------------------------------------
|
------------------------------------
|
||||||
|
|
||||||
1. This LICENSE AGREEMENT is between the Python Software Foundation
|
1. This LICENSE AGREEMENT is between the Python Software Foundation
|
||||||
("PSF"), and the Individual or Organization ("Licensee") accessing and
|
("PSF"), and the Individual or Organization ("Licensee") accessing and
|
||||||
otherwise using Python 2.2 software in source or binary form and its
|
otherwise using Python 2.3 software in source or binary form and its
|
||||||
associated documentation.
|
associated documentation.
|
||||||
|
|
||||||
2. Subject to the terms and conditions of this License Agreement, PSF
|
2. Subject to the terms and conditions of this License Agreement, PSF
|
||||||
hereby grants Licensee a nonexclusive, royalty-free, world-wide
|
hereby grants Licensee a nonexclusive, royalty-free, world-wide
|
||||||
license to reproduce, analyze, test, perform and/or display publicly,
|
license to reproduce, analyze, test, perform and/or display publicly,
|
||||||
prepare derivative works, distribute, and otherwise use Python 2.2
|
prepare derivative works, distribute, and otherwise use Python 2.3
|
||||||
alone or in any derivative version, provided, however, that PSF's
|
alone or in any derivative version, provided, however, that PSF's
|
||||||
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
|
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
|
||||||
2001, 2002 Python Software Foundation; All Rights Reserved" are
|
2001, 2002 Python Software Foundation; All Rights Reserved" are
|
||||||
retained in Python 2.2 alone or in any derivative version prepared by
|
retained in Python 2.3 alone or in any derivative version prepared by
|
||||||
Licensee.
|
Licensee.
|
||||||
|
|
||||||
3. In the event Licensee prepares a derivative work that is based on
|
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
|
or incorporates Python 2.3 or any part thereof, and wants to make
|
||||||
the derivative work available to others as provided herein, then
|
the derivative work available to others as provided herein, then
|
||||||
Licensee hereby agrees to include in any such work a brief summary of
|
Licensee hereby agrees to include in any such work a brief summary of
|
||||||
the changes made to Python 2.2.
|
the changes made to Python 2.3.
|
||||||
|
|
||||||
4. PSF is making Python 2.2 available to Licensee on an "AS IS"
|
4. PSF is making Python 2.3 available to Licensee on an "AS IS"
|
||||||
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
||||||
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
|
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
|
||||||
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
|
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
|
||||||
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.2 WILL NOT
|
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT
|
||||||
INFRINGE ANY THIRD PARTY RIGHTS.
|
INFRINGE ANY THIRD PARTY RIGHTS.
|
||||||
|
|
||||||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
|
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
|
2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
|
||||||
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2,
|
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
|
||||||
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||||
|
|
||||||
6. This License Agreement will automatically terminate upon a material
|
6. This License Agreement will automatically terminate upon a material
|
||||||
@ -107,7 +108,7 @@ Licensee. This License Agreement does not grant permission to use PSF
|
|||||||
trademarks or trade name in a trademark sense to endorse or promote
|
trademarks or trade name in a trademark sense to endorse or promote
|
||||||
products or services of Licensee, or any third party.
|
products or services of Licensee, or any third party.
|
||||||
|
|
||||||
8. By copying, installing or otherwise using Python 2.2, Licensee
|
8. By copying, installing or otherwise using Python 2.3, Licensee
|
||||||
agrees to be bound by the terms and conditions of this License
|
agrees to be bound by the terms and conditions of this License
|
||||||
Agreement.
|
Agreement.
|
||||||
|
|
||||||
|
6
README
6
README
@ -1,7 +1,7 @@
|
|||||||
This is Python version 2.3 (pre-alpha)
|
This is Python version 2.3 alpha 1
|
||||||
==========================
|
==================================
|
||||||
|
|
||||||
Copyright (c) 2001, 2002 Python Software Foundation.
|
Copyright (c) 2001, 2002, 2003 Python Software Foundation.
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Copyright (c) 2000 BeOpen.com.
|
Copyright (c) 2000 BeOpen.com.
|
||||||
|
Loading…
Reference in New Issue
Block a user