From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jun 2011 17:29:40 +0000 (-0500)
Subject: merge 3.1 (#12009)
X-Git-Tag: v3.3.0a1~2136^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aa68e4b324d4c130338bceabd8ccc058bf24231;p=python

merge 3.1 (#12009)
---

9aa68e4b324d4c130338bceabd8ccc058bf24231
diff --cc Misc/ACKS
index aa077fca60,e74324f112..d578c483f1
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -607,8 -563,8 +607,9 @@@ Skip Montanar
  Paul Moore
  Derek Morr
  James A Morrison
 +Pablo Mouzo
  Mher Movsisyan
+ Ruslan Mstoi
  Sjoerd Mullender
  Sape Mullender
  Michael Muller
diff --cc Misc/NEWS
index 2d00324e2e,6cf2867fdd..d3496b0f2d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -19,24 -30,70 +19,26 @@@ 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.
 -
 -- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
 -  module. Patch written by Charles-François Natali.
 -
 -- 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 #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 #6780: fix starts/endswith error message to mention that tuples are
 -  accepted too.
 -
 -- 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 #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 #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 #11450: Don't truncate hg version info in Py_GetBuildInfo() when
 -  there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
 -
 -- Issue #10451: memoryview objects could allow to mutate a readable buffer.
 -  Initial patch by Ross Lagerwall.
 -
 -- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
 -  class.
 -
 -- 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.
 +Library
 +-------
  
 -- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
 -  can now handle dates after 2038.
++- Issue #12009: Fixed regression in netrc file comment handling.
+ 
 -- issue #11828: startswith and endswith don't accept None as slice index.
 -  Patch by Torsten Becker.
 +- Issue #10694: zipfile now ignores garbage at the end of a zipfile.
  
 -- 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 #12283: Fixed regression in smtplib quoting of leading dots in DATA.
  
 -- 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.
 +- Issue #12168: SysLogHandler now allows NUL termination to be controlled using
 +  a new 'append_nul' attribute on the handler.
  
 -- Issue #5587: add a repr to dict_proxy objects.  Patch by David Stanek and
 -  Daniel Urban.
 +- Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes
 +  instead of os.stat.
  
 -- Issue #11506: Trying to assign to a bytes literal should result in a
 -  SyntaxError.
 +- Named tuples now work correctly with vars().
  
 -Library
 --------
 +- 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 #985064: Make plistlib more resilient to faulty input plists.
    Patch by Mher Movsisyan.