Issue #19131: The aifc module now correctly reads and writes sampwidth of

compressed streams.

diff --cc Lib/aifc.py
Simple merge

diff --cc Misc/NEWS
index 921508a538c18c7cf8e3ce48b165425a82af3e87,08ebbbd987d08e1394ca9b52333eacb44109dfb5..cef326d4807d31723d39f75b554541705b230686
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,59 -12,77 +10,62 @@@ Projected release date: 2013-10-2
  Core and Builtins
  -----------------
  
 -- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 -  least one place so as to avoid regressions.
 -
 -- Issue #19014: memoryview.cast() is now allowed on zero-length views.
 -
 -- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 -  absurdly high.
 -
 -- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
 -
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 -
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 -
 -- Issue #16741: Fix an error reporting in int().
 -
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 +- Issue #19221: Upgrade Unicode database to version 6.3.0.
  
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
 +- Issue #16742: The result of the C callback PyOS_ReadlineFunctionPointer must
 +  now be a string allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or NULL
 +  if an error occurred), instead of a string allocated by PyMem_Malloc() or
 +  PyMem_Realloc().
  
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
 +- Issue #19199: Remove ``PyThreadState.tick_counter`` field
  
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 +- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 +  least one place so as to avoid regressions.
  
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 +- Issue #19087: Improve bytearray allocation in order to allow cheap popping
 +  of data at the front (slice deletion).
  
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 +- Issue #19014: memoryview.cast() is now allowed on zero-length views.
  
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 +- Issue #18690: memoryview is now automatically registered with
 +  collections.abc.Sequence
  
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 +- Issue #19078: memoryview now correctly supports the reversed builtin
 +  (Patch by Claudiu Popa)
  
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 +Library
 +-------
  
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
++- Issue #19131: The aifc module now correctly reads and writes sampwidth of
++  compressed streams.
+ 
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 +- Issue #19209: Remove import of copyreg from the os module to speed up
 +  interpreter startup. stat_result and statvfs_result are now hard-coded to
 +  reside in the os module.
  
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
 +- Issue #19205: Don't import the 're' module in site and sysconfig module to
 +  to speed up interpreter start.
  
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
 +- Issue #9548: Add a minimal "_bootlocale" module that is imported by the
 +  _io module instead of the full locale module.
  
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +- Issue #18764: remove the 'print' alias for the PDB 'p' command so that it no
 +  longer shadows the print function.
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #19158:  a rare race in BoundedSemaphore could allow .release() too
 +  often.
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #15805: Add contextlib.redirect_stdout().
  
 -Library
 --------
 +- Issue #18716: Deprecate the formatter module.
  
 -- Issue #19131: The aifc module now correctly reads and writes sampwidth of
 -  compressed streams.
 +- Issue #18037: 2to3 now escapes '\u' and '\U' in native strings.
  
 -- Issue #19158:  a rare race in BoundedSemaphore could allow .release() too
 -  often.
 +- Issue #17839: base64.decodebytes and base64.encodebytes now accept any
 +  object that exports a 1 dimensional array of bytes (this means the same
 +  is now also true for base64_codec)
  
 -- Issue #18037: 2to3 now escapes '\u' and '\U' in native strings.
 +- Issue #19132: The pprint module now supports compact mode.
  
  - Issue #19137: The pprint module now correctly formats instances of set and
    frozenset subclasses.