Merge 3.2.1 release clone changes into main 3.2 branch after 3.2.1rc2 release.

birkenfeld · birkenfeld · commit bfd1edd15541 · 2011-07-04T19:55:22.000+02:00
diff --git a/.hgtags b/.hgtags
@@ -89,3 +89,4 @@ acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
 a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
+5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
diff --git a/Doc/Makefile b/Doc/Makefile
@@ -113,7 +113,7 @@ doctest: build
 pydoc-topics: BUILDER = pydoc-topics
 pydoc-topics: build
 	@echo "Building finished; now copy build/pydoc-topics/topics.py" \
-	      "to Lib/pydoc_data/topics.py"
+	      "to ../Lib/pydoc_data/topics.py"
 
 htmlview: html
 	 $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
@@ -566,7 +566,7 @@ The module :mod:`curses` defines the following functions:
 
    Instantiate the string *str* with the supplied parameters, where *str* should
    be a parameterized string obtained from the terminfo database.  E.g.
-   ``tparm(tigetstr("cup"), 5, 3)`` could result in x``'\033[6;4H'``, the exact
+   ``tparm(tigetstr("cup"), 5, 3)`` could result in ``'\033[6;4H'``, the exact
    result depending on terminal type.
 
 
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	2
 #define PY_MICRO_VERSION	1
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.2.1rc1+"
+#define PY_VERSION      	"3.2.1rc2+"
 /*--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
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1rc1"
+__version__ = "3.2.1rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.2.1rc1"
+IDLE_VERSION = "3.2.1rc2"
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -47,16 +47,31 @@ Tests
   in to the console windowserver (as may be the case under buildbot or ssh).
 
 
+What's New in Python 3.2.1?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+- Issue #12467: warnings: fix a race condition if a warning is emitted at
+  shutdown, if globals()['__file__'] is None.
+
+
 What's New in Python 3.2.1 release candidate 2?
 ===============================================
 
-*Release date: XX-XXX-2011*
+*Release date: 03-Jul-2011*
 
 Core and Builtins
 -----------------
 
-- Issue #12291: You can now load multiple marshalled objects from a stream,
-  with other data interleaved between marshalled objects.
+- Issue #12291: You can now load multiple marshalled objects from a stream, with
+  other data interleaved between marshalled objects.
 
 - Issue #12084: os.stat on Windows now works properly with relative symbolic
   links when called from any directory.
@@ -65,30 +80,29 @@ Core and Builtins
   the following case: sys.stdin.read() stopped with CTRL+d (end of file),
   raw_input() interrupted by CTRL+c.
 
-- Issue #9670: Increase the default stack size for secondary threads on
-  Mac OS X and FreeBSD to reduce the chances of a crash instead of a
-  "maximum recursion depth" RuntimeError exception.
-  (patch by Ronald Oussoren)
+- Issue #9670: Increase the default stack size for secondary threads on Mac OS X
+  and FreeBSD to reduce the chances of a crash instead of a "maximum recursion
+  depth" RuntimeError exception (patch by Ronald Oussoren).
 
 Library
 -------
 
 - Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better
-  conformance to the RFCs:  correctly handle Sender and Resent- headers.
+  conformance to the RFCs: correctly handle Sender and Resent headers.
 
 - Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by
   the garbage collector while the Heap lock is held.
 
 - Issue #12451: The XInclude default loader of xml.etree now decodes files from
   UTF-8 instead of the locale encoding if the encoding is not specified. It now
-  also opens XML files for the parser in binary mode instead of the text mode
-  to avoid encoding issues.
+  also opens XML files for the parser in binary mode instead of the text mode to
+  avoid encoding issues.
 
-- Issue #12451: doctest.debug_script() doesn't create a temporary file
-  anymore to avoid encoding issues.
+- Issue #12451: doctest.debug_script() doesn't create a temporary file anymore
+  to avoid encoding issues.
 
-- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available,
-  to read the Python script from the right encoding.
+- Issue #12451: pydoc.synopsis() now reads the encoding cookie if available, to
+  read the Python script from the right encoding.
 
 - Issue #12451: distutils now opens the setup script in binary mode to read the
   encoding cookie, instead of opening it in UTF-8.
@@ -110,9 +124,9 @@ Library
 - Issue #12383: Fix subprocess module with env={}: don't copy the environment
   variables, start with an empty environment.
 
-- Issue #11584: email.header.decode_header no longer fails if the header
-  passed to it is a Header object, and Header/make_header no longer fail
-  if given binary unknown-8bit input.
+- Issue #11584: email.header.decode_header no longer fails if the header passed
+  to it is a Header object, and Header/make_header no longer fail if given
+  binary unknown-8bit input.
 
 - Issue #11700: mailbox proxy object close methods can now be called multiple
   times without error.
@@ -144,8 +158,8 @@ Library
   constructor has failed, e.g. because of an undeclared keyword argument. Patch
   written by Oleg Oshmyan.
 
-- Issue #985064: Make plistlib more resilient to faulty input plists.
-  Patch by Mher Movsisyan.
+- Issue #985064: Make plistlib more resilient to faulty input plists.  Patch by
+  Mher Movsisyan.
 
 - Issue #12175: RawIOBase.readall() now returns None if read() returns None.
 
@@ -179,13 +193,13 @@ Build
 -----
 
 - Issue #8746: Correct faulty configure checks so that os.chflags() and
-  os.lchflags() are once again built on systems that support these
-  functions (*BSD and OS X).  Also add new stat file flags for OS X
-  (UF_HIDDEN and UF_COMPRESSED).
+  os.lchflags() are once again built on systems that support these functions
+  (*BSD and OS X).  Also add new stat file flags for OS X (UF_HIDDEN and
+  UF_COMPRESSED).
 
-- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,
-  ensure "make install" creates symlinks in --prefix bin for the "-32"
-  files in the framework bin directory like the installer does.
+- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, ensure
+  "make install" creates symlinks in --prefix bin for the "-32" files in the
+  framework bin directory like the installer does.
 
 Tests
 -----
@@ -196,15 +210,15 @@ Tests
   the output and displays it on failure instead. regrtest -v doesn't print the
   error twice anymore if there is only one error.
 
-- Issue #12141: Install a copy of template C module file so that
-  test_build_ext of test_distutils is no longer silently skipped when
-  run outside of a build directory.
+- Issue #12141: Install a copy of template C module file so that test_build_ext
+  of test_distutils is no longer silently skipped when run outside of a build
+  directory.
 
-- Issue #8746: Add additional tests for os.chflags() and os.lchflags().
-  Patch by Garrett Cooper.
+- Issue #8746: Add additional tests for os.chflags() and os.lchflags().  Patch
+  by Garrett Cooper.
 
-- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
-  on Mac OS X.  (Patch by Ronald Oussoren)
+- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9 on Mac
+  OS X.  (Patch by Ronald Oussoren)
 
 - Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2,
   iso2022_kr).
diff --git 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.1rc1
+%define version 3.2.1rc2
 %define libvers 3.2
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
@@ -1,4 +1,4 @@
-This is Python version 3.2.1 release candidate 1
+This is Python version 3.2.1 release candidate 2
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`# Updated automatically by the Python release process.`
`16`	`16`	`#`
`17`	`17`	`#--start constants--`
`18`		`-__version__ = "3.2.1rc1"`
	`18`	`+__version__ = "3.2.1rc2"`
`19`	`19`	`#--end constants--`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDLE_VERSION = "3.2.1rc1"`
	`1`	`+IDLE_VERSION = "3.2.1rc2"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-This is Python version 3.2.1 release candidate 1`
	`1`	`+This is Python version 3.2.1 release candidate 2`
`2`	`2`	`================================================`
`3`	`3`
`4`	`4`	`Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011`