Kaydet (Commit) 04427a07 authored tarafından Georg Brandl's avatar Georg Brandl

Merge in changes from 3.3.0 release clone.

...@@ -105,3 +105,4 @@ f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 ...@@ -105,3 +105,4 @@ f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4 7c51388a3aa7ce76a8541bbbdfc05d2d259a162c v3.3.0a4
e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1 e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
...@@ -262,6 +262,7 @@ library/stdtypes,,:end,s[start:end] ...@@ -262,6 +262,7 @@ library/stdtypes,,:end,s[start:end]
library/stdtypes,,::,>>> hash(v[::-2]) == hash(b'abcefg'[::-2]) library/stdtypes,,::,>>> hash(v[::-2]) == hash(b'abcefg'[::-2])
library/stdtypes,,:len,s[len(s):len(s)] library/stdtypes,,:len,s[len(s):len(s)]
library/stdtypes,,::,>>> y = m[::2] library/stdtypes,,::,>>> y = m[::2]
library/stdtypes,,::,>>> z = y[::-2]
library/string,,:end,s[start:end] library/string,,:end,s[start:end]
library/subprocess,,`,"output=`dmesg | grep hda`" library/subprocess,,`,"output=`dmesg | grep hda`"
library/subprocess,,`,"output=`mycmd myarg`" library/subprocess,,`,"output=`mycmd myarg`"
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#define PY_MAJOR_VERSION 3 #define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 3 #define PY_MINOR_VERSION 3
#define PY_MICRO_VERSION 0 #define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_BETA #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
#define PY_RELEASE_SERIAL 2 #define PY_RELEASE_SERIAL 1
/* Version as a string */ /* Version as a string */
#define PY_VERSION "3.3.0b2+" #define PY_VERSION "3.3.0rc1+"
/*--end constants--*/ /*--end constants--*/
/* 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.
......
...@@ -13,5 +13,5 @@ used from a setup script as ...@@ -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.3.0b2" __version__ = "3.3.0rc1"
#--end constants-- #--end constants--
IDLE_VERSION = "3.3.0b2" IDLE_VERSION = "3.3.0rc1"
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,10 +2,22 @@ ...@@ -2,10 +2,22 @@
Python News Python News
+++++++++++ +++++++++++
What's New in Python 3.3.0 Release Candidate 2?
===============================================
*Release date: XX-Sep-2012*
Core and Builtins
-----------------
Library
-------
What's New in Python 3.3.0 Release Candidate 1? What's New in Python 3.3.0 Release Candidate 1?
=============================================== ===============================================
*Release date: XX-Aug-2012* *Release date: 25-Aug-2012*
Core and Builtins Core and Builtins
----------------- -----------------
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
%define name python %define name python
#--start constants-- #--start constants--
%define version 3.3.0b2 %define version 3.3.0rc1
%define libvers 3.3 %define libvers 3.3
#--end constants-- #--end constants--
%define release 1pydotorg %define release 1pydotorg
......
This is Python version 3.3.0 beta 2 This is Python version 3.3.0 release candidate 1
=================================== ================================================
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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment