Assorted changes needed to release 2.2.2b1.

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index eb79a1ad222bf92b9c2112073a9837e46aaddd58..34fd530eb9581797302010190a1649e464f33b0f 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -22,11 +22,11 @@
 #define PY_MAJOR_VERSION       2
 #define PY_MINOR_VERSION       2
 #define PY_MICRO_VERSION       2
-#define PY_RELEASE_LEVEL       PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL      0
+#define PY_RELEASE_LEVEL       PY_RELEASE_LEVEL_BETA
+#define PY_RELEASE_SERIAL      1
 
 /* Version as a string */
-#define PY_VERSION             "2.2.2a0"
+#define PY_VERSION             "2.2.2b1"
 
 /* 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 >= ... */

diff --git a/LICENSE b/LICENSE
index 503c8754b653b2ce5e9d0780bee3965999928e6e..3917f8f3ddb1260e919723cb43e64f884d433afa 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -40,6 +40,7 @@ the various releases.
     2.1.2           2.1.1       2002        PSF         yes
     2.1.3           2.1.2       2002        PSF         yes
     2.2.1           2.2         2002        PSF         yes
+    2.2.2           2.2.1       2002        PSF         yes
 
 Footnotes:
 
@@ -56,40 +57,40 @@ direction to make these releases possible.
 B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
 ===============================================================
 
-PSF LICENSE AGREEMENT FOR PYTHON 2.2.1
+PSF LICENSE AGREEMENT FOR PYTHON 2.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.1 software in source or binary form and its
+otherwise using Python 2.2.2 software in source or binary form and its
 associated documentation.
 
 2. Subject to the terms and conditions of this License Agreement, PSF
 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.1
+prepare derivative works, distribute, and otherwise use Python 2.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.1 alone or in any derivative version prepared
+retained in Python 2.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.1 or any part thereof, and wants to make
+or incorporates Python 2.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.1.
+the changes made to Python 2.2.2.
 
-4. PSF is making Python 2.2.1 available to Licensee on an "AS IS"
+4. PSF is making Python 2.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.1 WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.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.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2.1,
+2.2.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2.2,
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -101,7 +102,7 @@ Licensee.  This License Agreement does not grant permission to use PSF
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using Python 2.2.1, Licensee
+8. By copying, installing or otherwise using Python 2.2.2, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.
 

diff --git a/PCbuild/BUILDno.txt b/PCbuild/BUILDno.txt
index 52867141b3e6af0f6dc7468d8c15069f43e301be..dd295da42628185e4e70cfaaae73cd76f0fbe3d6 100644 (file)
--- a/PCbuild/BUILDno.txt
+++ b/PCbuild/BUILDno.txt
@@ -33,6 +33,8 @@ How to change the Windows build number:
 
 Windows Python BUILD numbers
 ----------------------------
+  36    2.2.2b1
+        7-Oct-2002
   34    2.2.1 (final)
         10-Apr-2002
   33    2.2.1c2

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 0519fe3a4f3e618d1edf58710759ca31bb5545ac..ffe18cd9e66400fb3b1ed72488779fc6884d7b99 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=8.14
-  Title=Python 2.2.2a0
+  Title=Python 2.2.2b1
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -18,9 +18,9 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=Python-2.2.2a0.exe
+  EXE Filename=Python-2.2.2b1.exe
   Dialogs Version=8
-  Version File=2.2.2a0
+  Version File=2.2.2b1
   Version Description=Python Programming Language
   Version Copyright=©2002 Python Software Foundation
   Version Company=PythonLabs at Zope Corporation
@@ -64,7 +64,7 @@ item: Global
 end
 item: Set Variable
   Variable=PYVER_STRING
-  Value=2.2.2a0
+  Value=2.2.2b1
 end
 item: Remark
 end

diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index e133cf55b523d2afe5cdc5d071bdbb42c217a653..759b360d2d542e2dfab6bc0c9753bb43a30b5bbb 100644 (file)
--- a/PCbuild/pythoncore.dsp
+++ b/PCbuild/pythoncore.dsp
@@ -739,11 +739,11 @@ SOURCE=..\Modules\getbuildinfo.c
 \r
 !IF  "$(CFG)" == "pythoncore - Win32 Release"\r
 \r
-# ADD CPP /D BUILD=34\r
+# ADD CPP /D BUILD=36\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
 \r
-# ADD CPP /D BUILD=34\r
+# ADD CPP /D BUILD=36\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"\r
 \r