diff options
author | Georg Brandl <georg@python.org> | 2014-02-23 07:46:00 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2014-02-23 07:46:00 (GMT) |
commit | 68707af1fb87c8b3d128b71c863cd68195da198f (patch) | |
tree | f58596deb05bfdf83a0e20e52bb7b50dd38a40e8 | |
parent | 89e5671be7f2d66c6b3e9e0a41531b3c1dc7efd2 (diff) | |
parent | e12675a0f2a57ebd74a90400454c5dbdbc92882e (diff) | |
download | cpython-68707af1fb87c8b3d128b71c863cd68195da198f.zip cpython-68707af1fb87c8b3d128b71c863cd68195da198f.tar.gz cpython-68707af1fb87c8b3d128b71c863cd68195da198f.tar.bz2 |
mergev3.3.5rc1
-rw-r--r-- | Include/patchlevel.h | 8 | ||||
-rw-r--r-- | Lib/distutils/__init__.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/idlever.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 2 | ||||
-rw-r--r-- | Misc/RPM/python-3.3.spec | 2 | ||||
-rw-r--r-- | README | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 4196c44..236f00c 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -18,12 +18,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 3 -#define PY_MICRO_VERSION 4 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL -#define PY_RELEASE_SERIAL 0 +#define PY_MICRO_VERSION 5 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA +#define PY_RELEASE_SERIAL 1 /* Version as a string */ -#define PY_VERSION "3.3.4+" +#define PY_VERSION "3.3.5rc1" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index de5560b..b79071a 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.3.4" +__version__ = "3.3.5rc1" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index e9e88ef..4cd9862 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.3.4" +IDLE_VERSION = "3.3.5rc1" @@ -5,7 +5,7 @@ Python News What's New in Python 3.3.5 release candidate 1? =============================================== -*Release date: XXXX-XX-XX* +*Release date: 23-Feb-2014* Core and Builtins ----------------- diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec index 3abbe53..25969bc 100644 --- a/Misc/RPM/python-3.3.spec +++ b/Misc/RPM/python-3.3.spec @@ -39,7 +39,7 @@ %define name python #--start constants-- -%define version 3.3.4 +%define version 3.3.5rc1 %define libvers 3.3 #--end constants-- %define release 1pydotorg @@ -1,5 +1,5 @@ -This is Python version 3.3.4 -============================ +This is Python version 3.3.5 release candidate 1 +================================================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved. |