diff options
author | Georg Brandl <georg@python.org> | 2013-05-12 17:44:21 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2013-05-12 17:44:21 (GMT) |
commit | 997d05d89ff918745ca1240f59c2081776857282 (patch) | |
tree | 3b58ec416574ee900e35761a2bf5073eef30a079 | |
parent | 3eab6b363a968e907605fe749d12941c3be29761 (diff) | |
parent | 88f4dd64513a9738eaec6a1228c62dd4ab3dbafe (diff) | |
download | cpython-997d05d89ff918745ca1240f59c2081776857282.zip cpython-997d05d89ff918745ca1240f59c2081776857282.tar.gz cpython-997d05d89ff918745ca1240f59c2081776857282.tar.bz2 |
merge
-rw-r--r-- | Include/patchlevel.h | 4 | ||||
-rw-r--r-- | Lib/distutils/__init__.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/idlever.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 4 | ||||
-rw-r--r-- | Misc/RPM/python-3.3.spec | 2 | ||||
-rw-r--r-- | README | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 09a4859..357a6f5 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 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 index f8af1b3..83d7cb7 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.1" +__version__ = "3.3.2" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index 13b2b9b..b7ff0f8 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.3.1" +IDLE_VERSION = "3.3.2" @@ -5,9 +5,9 @@ Python News What's New in Python 3.3.2? =========================== -.. *Release date: XXXX-XX-XX* +*Release date: 13-May-2013* -*Not yet released, see sections below for changes released in 3.3.1* +.. *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 index 7eb1cc6..a9b489b 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.1 +%define version 3.3.2 %define libvers 3.3 #--end constants-- %define release 1pydotorg @@ -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, |