Issue #11603: Fix a crash when __str__ is rebound as __repr__.

Patch by Andreas Stührk.

diff --cc Lib/test/test_descr.py
Simple merge

diff --cc Misc/NEWS
index 2154393776051a4df9dcc592d1867329beba3c8a,b14e169a883429e185a1b86d08a94c1e9bfa7cfb..fdf44989d1b4e2cf0805604647762cabe62e2ecc
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -27,70 -13,14 +27,73 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11603: Fix a crash when __str__ is rebound as __repr__.  Patch by
+   Andreas Stührk.
+ 
 +- Issue #11321: Fix a crash with multiple imports of the _pickle module when
 +  embedding Python.  Patch by Andreas Stührk.
 +
 +- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
 +
 +- Issue #4376: ctypes now supports nested structures in a endian different than
 +  the parent structure. Patch by Vlad Riscutia.
 +
 +- Raise ValueError when attempting to set the _CHUNK_SIZE attribute of a
 +  TextIOWrapper to a huge value, not TypeError.
 +
 +- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors
 +  if the process has only one pipe.
 +
 +- 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).
 +
 +- Issue #12451: pydoc: importfile() now opens the Python script in binary mode,
 +  instead of text mode using the locale encoding, to avoid encoding issues.
 +
 +- Issue #12451: runpy: run_path() now opens the Python script in binary mode,
 +  instead of text mode using the locale encoding, to support other encodings
 +  than UTF-8 (scripts using the coding cookie).
 +
 +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead
 +  of the text mode (using the locale encoding) to avoid encoding issues.
 +
 +C-API
 +-----
 +
 +Tests
 +-----
 +
 +- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
 +  as the processor type on some Mac systems.
 +
 +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
 +  an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
 +  Web site.
 +
 +- 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.
 +
 +- Issue #12497: Install test/data to prevent failures of the various codecmaps
 +  tests.
 +
 +- Issue #12496: Install test/capath directory to prevent test_connect_capath
 +  testcase failure in test_ssl.
  
 -What's New in Python 3.1.4?
 +- Issue #12469: Run "wakeup" signal tests in subprocess to run the test in a
 +  fresh process with only one thread and to not change signal handling of the
 +  parent process.
 +
 +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run
 +  test_tk or test_ttk_guionly under a username that is not currently logged
 +  in to the console windowserver (as may be the case under buildbot or ssh).
 +
 +
 +What's New in Python 3.2.1?
  ===========================
  
 -*Release date: 2011-06-11*
 +*Release date: 10-Jul-2011*
  
  Library
  -------

diff --cc Objects/typeobject.c
Simple merge