diff options
| author | Georg Brandl <georg@python.org> | 2012-04-11 10:46:24 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-04-11 10:46:24 (GMT) |
| commit | a51497ab86519bd66fc2758a16493752ba59dad8 (patch) | |
| tree | 7b226db5103ffec095e77f09eb2dc74785519fd9 | |
| parent | b96a3545565a4b08260a7d4e833d94dcff2cc36b (diff) | |
| parent | 507776e787045abfa55f8c229fb7dde71834effd (diff) | |
| download | cpython-a51497ab86519bd66fc2758a16493752ba59dad8.zip cpython-a51497ab86519bd66fc2758a16493752ba59dad8.tar.gz cpython-a51497ab86519bd66fc2758a16493752ba59dad8.tar.bz2 | |
Merge 3.2.3 release clone.
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Lib/distutils/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/idlever.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 10 | ||||
| -rw-r--r-- | Misc/RPM/python-3.2.spec | 2 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | Tools/msi/uuids.py | 1 |
8 files changed, 15 insertions, 13 deletions
@@ -98,3 +98,4 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2 7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1 428f05cb7277e1d42bb9dd8d1af6b6270ebc6112 v3.2.3rc2 +3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 diff --git a/Include/patchlevel.h b/Include/patchlevel.h index a84c351..0839071 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 d8d61c5..b52a9fe 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 250ecf0..17455db 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.2.3rc2" +IDLE_VERSION = "3.2.3" @@ -167,13 +167,13 @@ Extension Modules 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? diff --git a/Misc/RPM/python-3.2.spec b/Misc/RPM/python-3.2.spec index 87bfda1..18f3e77 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 @@ -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. diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index e06cdfb..80d17ad 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 } |