From a7f6b14fa6c7ebe402a62cd425fb7aeb007080a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 18 Mar 2012 20:39:19 +0100 Subject: [PATCH 1/6] Add 3.2.3rc2 uuid. --- Tools/msi/uuids.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index e06cdfb2da0..80d17adfdb4 100644 --- a/Tools/msi/uuids.py +++ b/Tools/msi/uuids.py @@ -93,6 +93,7 @@ product_codes = { '3.2.2121':'{DFB29A53-ACC4-44e6-85A6-D0DA26FE8E4E}', # 3.2.2rc1 '3.2.2150':'{4CDE3168-D060-4b7c-BC74-4D8F9BB01AFD}', # 3.2.2 '3.2.3121':'{B8E8CFF7-E4C6-4a7c-9F06-BB3A8B75DDA8}', # 3.2.3rc1 + '3.2.3122':'{E8DCD3E0-12B6-4fb7-9DB5-543C2E67372E}', # 3.2.3rc2 '3.2.3150':'{789C9644-9F82-44d3-B4CA-AC31F46F5882}', # 3.2.3 } From aa589b3ca7b2bf680b6d9338a0fbf831289f067f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Thu, 22 Mar 2012 23:10:37 +0000 Subject: [PATCH 2/6] Issue #14387 : undefine 'small' so that it doesn't clash with Windows headers. --- Include/accu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Include/accu.h b/Include/accu.h index 9655d37bb1f..3636ea6c98f 100644 --- a/Include/accu.h +++ b/Include/accu.h @@ -16,6 +16,8 @@ extern "C" { #endif +#undef small /* defined by some Windows headers */ + typedef struct { PyObject *large; /* A list of previously accumulated large strings */ PyObject *small; /* Pending small strings */ From 470f33f50b446f17c2729899cdea4edd46b4f0da Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 10 Apr 2012 19:27:27 +0200 Subject: [PATCH 3/6] News entry for f91ecbc8bafc. --- Misc/NEWS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 82572866b0d..5e03fb334b5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -5,13 +5,13 @@ Python News What's New in Python 3.2.3? =========================== -*Release date: XX-Mar-2012* +*Release date: 10-Apr-2012* -Core and Builtins ------------------ +Build +----- -Library -------- +- Issue #14387: Work around a problem building extension modules under Windows + by undefining ``small`` before use in the Python headers. What's New in Python 3.2.3 release candidate 2? From 44036016b9ac8c1ceeb2a634585513ccb674c571 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 10 Apr 2012 19:28:09 +0200 Subject: [PATCH 4/6] Bump to 3.2.3 final. --- Include/patchlevel.h | 6 +++--- Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Misc/RPM/python-3.2.spec | 2 +- README | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 4a9d9ceee02..79696184000 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 2 #define PY_MICRO_VERSION 3 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 2 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.2.3rc2+" +#define PY_VERSION "3.2.3" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index d8d61c5432e..b52a9fe6c40 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -13,5 +13,5 @@ used from a setup script as # Updated automatically by the Python release process. # #--start constants-- -__version__ = "3.2.3rc2" +__version__ = "3.2.3" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index 250ecf064e0..17455dbeee0 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.2.3rc2" +IDLE_VERSION = "3.2.3" diff --git a/Misc/RPM/python-3.2.spec b/Misc/RPM/python-3.2.spec index 87bfda1fd95..18f3e77aece 100644 --- a/Misc/RPM/python-3.2.spec +++ b/Misc/RPM/python-3.2.spec @@ -39,7 +39,7 @@ %define name python #--start constants-- -%define version 3.2.3rc2 +%define version 3.2.3 %define libvers 3.2 #--end constants-- %define release 1pydotorg diff --git a/README b/README index 332c9b1b518..b13806b899e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is Python version 3.2.3 rc2 -================================ +This is Python version 3.2.3 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Python Software Foundation. All rights reserved. From 6b2e4cb570b1e89dad9b9460fea96725fbfd5061 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 10 Apr 2012 19:30:26 +0200 Subject: [PATCH 5/6] Added tag v3.2.3 for changeset 3d0686d90f55 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 87582aa19b8..544fc14f458 100644 --- a/.hgtags +++ b/.hgtags @@ -96,3 +96,4 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2 7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 +3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 From 507776e787045abfa55f8c229fb7dde71834effd Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 11 Apr 2012 12:45:12 +0200 Subject: [PATCH 6/6] Post-release update. --- Include/patchlevel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 79696184000..65584db67d7 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -23,7 +23,7 @@ #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.2.3" +#define PY_VERSION "3.2.3+" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty