merge 3.1 (#12221)

diff --cc Misc/NEWS
index 3703ac5bd76bbd4384dfea504bbdcc3014dde69e,ed70507c62c848d9ed146ffd57a9756b17803d8e..baf235c23e3a494b2550412d943ce98ecdedc7d2
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -19,81 -25,96 +19,86 @@@ Core and Builtin
    "maximum recursion depth" RuntimeError exception.
    (patch by Ronald Oussoren)
  
 -- Correct lookup of __dir__ on objects. Among other things, this causes errors
 -  besides AttributeError found on lookup to be propagated.
 +Library
 +-------
  
 -- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
 -  module. Patch written by Charles-François Natali.
 +- Issue #12085: Fix an attribute error in subprocess.Popen destructor if the
 +  constructor has failed, e.g. because of an undeclared keyword argument. Patch
 +  written by Oleg Oshmyan.
  
 -- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
 -  clear the end-of-file indicator after CTRL+d.
 +- Issue #985064: Make plistlib more resilient to faulty input plists.
 +  Patch by Mher Movsisyan.
  
 -- Issue #9756: When calling a method descriptor or a slot wrapper descriptor,
 -  the check of the object type doesn't read the __class__ attribute anymore.
 -  Fix a crash if a class override its __class__ attribute (e.g. a proxy of the
 -  str type). Patch written by Andreas Stührk.
 +- Issue #12175: RawIOBase.readall() now returns None if read() returns None.
  
 -- Issue #6780: fix starts/endswith error message to mention that tuples are
 -  accepted too.
 +- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
 +  if the file is closed.
  
 -- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files
 -  between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP
 -  chars (e.g. "\U00012345"[0]).
 +- Issue #12070: Fix the Makefile parser of the sysconfig module to handle
 +  correctly references to "bogus variable" (e.g. "prefix=$/opt/python").
  
 -- Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted
 -  (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch
 -  written by Charles-Francois Natali.
 +- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to
 +  their encode() method anymore, but continue to call the reset() method if the
 +  final argument is True.
  
 -- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file
 -  doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int
 -  (length bigger than 2^31-1 bytes).
 +- Issue #5715: In socketserver, close the server socket in the child process.
  
 -- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
 -  there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
 +- Correct lookup of __dir__ on objects. Among other things, this causes errors
 +  besides AttributeError found on lookup to be propagated.
  
 -- Issue #10451: memoryview objects could allow to mutate a readable buffer.
 -  Initial patch by Ross Lagerwall.
 +- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore
 +  to be able to unload the module.
  
 -- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
 -  class.
 +- Issue #12065: connect_ex() on an SSL socket now returns the original errno
 +  when the socket's timeout expires (it used to return None).
  
 -- Issue #8020: Avoid a crash where the small objects allocator would read
 -  non-Python managed memory while it is being modified by another thread.
 -  Patch by Matt Bandy.
++Extension Modules
++-----------------
+ 
 -- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
 -  can now handle dates after 2038.
++- Issue #12221: Replace pyexpat.__version__ with the Python version.
+ 
 -- issue #11828: startswith and endswith don't accept None as slice index.
 -  Patch by Torsten Becker.
 +Build
 +-----
  
 -- Issue #4236: PyModule_Create2 now checks the import machinery directly
 -  rather than the Py_IsInitialized flag, avoiding a Fatal Python
 -  error in certain circumstances when an import is done in __del__.
 +- 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 #10596: Fix float.__mod__ to have the same behaviour as
 -  float.__divmod__ with respect to signed zeros.  -4.0 % 4.0 should be
 -  0.0, not -0.0.
 +Tests
 +-----
  
 -- Issue #5587: add a repr to dict_proxy objects.  Patch by David Stanek and
 -  Daniel Urban.
 +- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2,
 +  iso2022_kr).
  
 -- Issue #11506: Trying to assign to a bytes literal should result in a
 -  SyntaxError.
  
 -Library
 --------
 +What's New in Python 3.2.1 release candidate 1?
 +===============================================
  
 -- Issue #985064: Make plistlib more resilient to faulty input plists.
 -  Patch by Mher Movsisyan.
 +*Release date: 15-May-2011*
  
 -- Issue #12175: RawIOBase.readall() now returns None if read() returns None.
 +Core and Builtins
 +-----------------
  
 -- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
 -  if the file is closed.
 +- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
 +  module. Patch written by Charles-François Natali.
  
 -- Issue #12100: Don't reset incremental encoders of CJK codecs at each call to
 -  their encode() method anymore, but continue to call the reset() method if the
 -  final argument is True.
 +- Issue #12044: Fixed subprocess.Popen when used as a context manager to
 +  wait for the process to end when exiting the context to avoid unintentionally
 +  leaving zombie processes around.
  
 -- Issue #5715: In socketserver, close the server socket in the child process.
 +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
 +  clear the end-of-file indicator after CTRL+d.
  
 -- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore
 -  to be able to unload the module.
 +Library
 +-------
  
 -- Issue #10801: In zipfile, support different encodings for the header and
 -  the filenames.
 +- Issue #11088: don't crash when using F5 to run a script in IDLE on MacOSX
 +  with Tk 8.5.
  
 -- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead
 -  of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD.
 +- Issue #9516: Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET
 +  is set in shell.
  
 -- Issue #10756: atexit normalizes the exception before displaying it. Patch by
 -  Andreas Stührk.
 +- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional.
  
  - Issue #8650: Make zlib module 64-bit clean. compress(), decompress() and
    their incremental counterparts now raise OverflowError if given an input

diff --cc Modules/pyexpat.c
index 40d93246fc17d0842af3656f5901a5db23690016,7c610a81ca752e545caafc72af2302fc9fab2bd3..d295a0f5071d60f810edef15cc31310264e2dec8
--- 1/Modules/pyexpat.c
--- 2/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@@ -1681,13 -1770,10 +1661,14 @@@ MODULE_INITFUNC(void
      PyObject *errors_module;
      PyObject *modelmod_name;
      PyObject *model_module;
+     PyObject *version;
      PyObject *sys_modules;
 +    PyObject *tmpnum, *tmpstr;
 +    PyObject *codes_dict;
 +    PyObject *rev_codes_dict;
 +    int res;
      static struct PyExpat_CAPI capi;
 -    PyObject* capi_object;
 +    PyObject *capi_object;
  
      if (errmod_name == NULL)
          return NULL;