[Python-checkins] cpython (merge 3.3 -> 3.3): merge
georg.brandl
python-checkins at python.org
Sun May 12 19:55:21 CEST 2013
http://hg.python.org/cpython/rev/8ae3baa76b75
changeset: 83751:8ae3baa76b75
branch: 3.3
parent: 83748:e730447caf20
parent: 83750:0934c5818417
user: Georg Brandl <georg at python.org>
date: Sun May 12 19:44:21 2013 +0200
summary:
merge
files:
Include/patchlevel.h | 4 ++--
Lib/distutils/__init__.py | 2 +-
Lib/idlelib/idlever.py | 2 +-
Misc/NEWS | 6 +++---
Misc/RPM/python-3.3.spec | 2 +-
README | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- 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 1
+#define PY_MICRO_VERSION 2
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.3.1+"
+#define PY_VERSION "3.3.2"
/*--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
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
# Updated automatically by the Python release process.
#
#--start constants--
-__version__ = "3.3.1"
+__version__ = "3.3.2"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.1"
+IDLE_VERSION = "3.3.2"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,9 +5,9 @@
What's New in Python 3.3.2?
===========================
-.. *Release date: XXXX-XX-XX*
-
-*Not yet released, see sections below for changes released in 3.3.1*
+*Release date: 13-May-2013*
+
+.. *Not yet released, see sections below for changes released in 3.3.1*
Core and Builtins
-----------------
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- 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.1
+%define version 3.3.2
%define libvers 3.3
#--end constants--
%define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.1
+This is Python version 3.3.2
============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list