Merge 3.2.1 release clone into main repo.

7 files changed, 21 insertions, 23 deletions

diff --git a/.hgtags b/.hgtags
index 299db0b..97740e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -90,3 +90,4 @@ a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
 5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
+ac1f7e5c05104d557d5acd922e95625ba5d1fe10 v3.2.1
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 621f4c5..a9477b2 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	2
 #define PY_MICRO_VERSION	1
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	2
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.2.1rc2+"
+#define PY_VERSION      	"3.2.1+"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 2602c50..a470ade 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -15,5 +15,5 @@ __revision__ = "$Id$"
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1rc2"
+__version__ = "3.2.1"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index a437b7b..3fc5e7f 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.2.1rc2"
+IDLE_VERSION = "3.2.1"
diff --git a/Misc/NEWS b/Misc/NEWS
index 1440035..9a46b72 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@ Python News
 What's New in Python 3.2.2?
 ===========================
 
-*Release date: XX-XX-2011*
+*Release date: XX-XXX-2011*
 
 Core and Builtins
 -----------------
@@ -24,9 +24,6 @@ Library
 - Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors
   if the process has only one pipe.
 
-- Issue #12467: warnings: fix a race condition if a warning is emitted at
-  shutdown, if globals()['__file__'] is None.
-
 - Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support
   Python scripts using a encoding different than UTF-8 (read the coding cookie
   of the script).
@@ -47,17 +44,10 @@ C-API
 Tests
 -----
 
-- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
-  failure in name resolution.
-
 - Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
   an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
   Web site.
 
-- Avoid failing in test_urllibnet.test_bad_address when some overzealous
-  DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
-  is now skipped instead.
-
 - Issue #12440: When testing whether some bits in SSLContext.options can be
   reset, check the version of the OpenSSL headers Python was compiled against,
   rather than the runtime version of the OpenSSL library.
@@ -80,10 +70,7 @@ Tests
 What's New in Python 3.2.1?
 ===========================
 
-*Release date: XXXX-XX-XX*
-
-Core and Builtins
------------------
+*Release date: 10-Jul-2011*
 
 Library
 -------
@@ -91,6 +78,16 @@ Library
 - Issue #12467: warnings: fix a race condition if a warning is emitted at
   shutdown, if globals()['__file__'] is None.
 
+Tests
+-----
+
+- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
+  failure in name resolution.
+
+- Avoid failing in test_urllibnet.test_bad_address when some overzealous
+  DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
+  is now skipped instead.
+
 
 What's New in Python 3.2.1 release candidate 2?
 ===============================================
diff --git a/Misc/RPM/python-3.2.spec b/Misc/RPM/python-3.2.spec
index 234caeb..955ca3d 100644
--- a/Misc/RPM/python-3.2.spec
+++ b/Misc/RPM/python-3.2.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.2.1rc2
+%define version 3.2.1
 %define libvers 3.2
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
index 7fa2288..4667a70 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.2.1 release candidate 2
-================================================
+This is Python version 3.2.1
+============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Python Software Foundation.  All rights reserved.