mirror of
https://github.com/python/cpython.git
synced 2025-09-30 04:15:43 +00:00
merge 3.2.2 release branch for rc
This commit is contained in:
commit
ab5a044aec
10 changed files with 20 additions and 16 deletions
1
.hgtags
1
.hgtags
|
@ -94,3 +94,4 @@ cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
|
||||||
ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
|
ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
|
||||||
c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
|
c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1
|
||||||
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
|
137e45f15c0bd262c9ad4c032d97425bc0589456 v3.2.2
|
||||||
|
7085403daf439adb3f9e70ef13f6bedb1c447376 v3.2.3rc1
|
||||||
|
|
|
@ -118,6 +118,8 @@ been GPL-compatible; the table below summarizes the various releases.
|
||||||
+----------------+--------------+------------+------------+-----------------+
|
+----------------+--------------+------------+------------+-----------------+
|
||||||
| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
|
| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
|
||||||
+----------------+--------------+------------+------------+-----------------+
|
+----------------+--------------+------------+------------+-----------------+
|
||||||
|
| 3.2.3 | 3.2.2 | 2012 | PSF | yes |
|
||||||
|
+----------------+--------------+------------+------------+-----------------+
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,12 @@
|
||||||
/*--start constants--*/
|
/*--start constants--*/
|
||||||
#define PY_MAJOR_VERSION 3
|
#define PY_MAJOR_VERSION 3
|
||||||
#define PY_MINOR_VERSION 2
|
#define PY_MINOR_VERSION 2
|
||||||
#define PY_MICRO_VERSION 2
|
#define PY_MICRO_VERSION 3
|
||||||
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
|
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
|
||||||
#define PY_RELEASE_SERIAL 0
|
#define PY_RELEASE_SERIAL 1
|
||||||
|
|
||||||
/* Version as a string */
|
/* Version as a string */
|
||||||
#define PY_VERSION "3.2.2+"
|
#define PY_VERSION "3.2.3rc1"
|
||||||
/*--end constants--*/
|
/*--end constants--*/
|
||||||
|
|
||||||
/* Subversion Revision number of this file (not of the repository). Empty
|
/* Subversion Revision number of this file (not of the repository). Empty
|
||||||
|
|
1
LICENSE
1
LICENSE
|
@ -73,6 +73,7 @@ the various releases.
|
||||||
3.2 3.1 2011 PSF yes
|
3.2 3.1 2011 PSF yes
|
||||||
3.2.1 3.2 2011 PSF yes
|
3.2.1 3.2 2011 PSF yes
|
||||||
3.2.2 3.2.1 2011 PSF yes
|
3.2.2 3.2.1 2011 PSF yes
|
||||||
|
3.2.3 3.2.2 2012 PSF yes
|
||||||
|
|
||||||
Footnotes:
|
Footnotes:
|
||||||
|
|
||||||
|
|
|
@ -13,5 +13,5 @@ used from a setup script as
|
||||||
# Updated automatically by the Python release process.
|
# Updated automatically by the Python release process.
|
||||||
#
|
#
|
||||||
#--start constants--
|
#--start constants--
|
||||||
__version__ = "3.2.2"
|
__version__ = "3.2.3rc1"
|
||||||
#--end constants--
|
#--end constants--
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
IDLE_VERSION = "3.2.2"
|
IDLE_VERSION = "3.2.3rc1"
|
||||||
|
|
12
Misc/NEWS
12
Misc/NEWS
|
@ -2,22 +2,22 @@
|
||||||
Python News
|
Python News
|
||||||
+++++++++++
|
+++++++++++
|
||||||
|
|
||||||
What's New in Python 3.2.3?
|
What's New in Python 3.2.3 release candidate 1?
|
||||||
===========================
|
===============================================
|
||||||
|
|
||||||
*Release date: XX-XXX-2011*
|
*Release date: 24-Feb-2011*
|
||||||
|
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
- Issue #14084: Fix a file descriptor leak when importing a module with a
|
|
||||||
bad encoding.
|
|
||||||
|
|
||||||
- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
|
- Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
|
||||||
environment variable, to provide an opt-in way to protect against denial of
|
environment variable, to provide an opt-in way to protect against denial of
|
||||||
service attacks due to hash collisions within the dict and set types. Patch
|
service attacks due to hash collisions within the dict and set types. Patch
|
||||||
by David Malcolm, based on work by Victor Stinner.
|
by David Malcolm, based on work by Victor Stinner.
|
||||||
|
|
||||||
|
- Issue #14084: Fix a file descriptor leak when importing a module with a
|
||||||
|
bad encoding.
|
||||||
|
|
||||||
- Issue #13020: Fix a reference leak when allocating a structsequence object
|
- Issue #13020: Fix a reference leak when allocating a structsequence object
|
||||||
fails. Patch by Suman Saha.
|
fails. Patch by Suman Saha.
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
%define name python
|
%define name python
|
||||||
#--start constants--
|
#--start constants--
|
||||||
%define version 3.2.2
|
%define version 3.2.3rc1
|
||||||
%define libvers 3.2
|
%define libvers 3.2
|
||||||
#--end constants--
|
#--end constants--
|
||||||
%define release 1pydotorg
|
%define release 1pydotorg
|
||||||
|
|
|
@ -61,7 +61,7 @@ BEGIN
|
||||||
VALUE "FileDescription", "Python Core\0"
|
VALUE "FileDescription", "Python Core\0"
|
||||||
VALUE "FileVersion", PYTHON_VERSION
|
VALUE "FileVersion", PYTHON_VERSION
|
||||||
VALUE "InternalName", "Python DLL\0"
|
VALUE "InternalName", "Python DLL\0"
|
||||||
VALUE "LegalCopyright", "Copyright © 2001-2011 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
|
VALUE "LegalCopyright", "Copyright © 2001-2012 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
|
||||||
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
|
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
|
||||||
VALUE "ProductName", "Python\0"
|
VALUE "ProductName", "Python\0"
|
||||||
VALUE "ProductVersion", PYTHON_VERSION
|
VALUE "ProductVersion", PYTHON_VERSION
|
||||||
|
|
4
README
4
README
|
@ -1,5 +1,5 @@
|
||||||
This is Python version 3.2.2
|
This is Python version 3.2.3 rc1
|
||||||
============================
|
================================
|
||||||
|
|
||||||
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
|
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
|
||||||
2012 Python Software Foundation. All rights reserved.
|
2012 Python Software Foundation. All rights reserved.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue