From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 12 Mar 2013 23:55:07 +0000 (+0200)
Subject: #17368: merge with 3.3.
X-Git-Tag: v3.4.0a1~1213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=405952f1a89c75d71bf8420b28d4bab1277e2ccd;p=python

#17368: merge with 3.3.
---

405952f1a89c75d71bf8420b28d4bab1277e2ccd
diff --cc Misc/NEWS
index b062c6ccdc,1b561df784..a2068b192a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -277,12 -193,10 +277,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17368: Fix an off-by-one error in the Python JSON decoder that caused
+   a failure while decoding empty object literals when object_pairs_hook was
+   specified.
+ 
 +_ Issue #17385: Fix quadratic behavior in threading.Condition.  The FIFO
 +  queue now uses a deque instead of a list.
 +
 +- Issue #15806: Add contextlib.ignored().  This creates a context manager
 +  to ignore specified exceptions, replacing the "except Exc: pass" idiom.
 +
  - Issue #14645: The email generator classes now produce output using the
    specified linesep throughout.  Previously if the prolog, epilog, or
    body were stored with a different linesep, that linesep was used.  This