From: Petri Lehtinen <petri@digip.org>
Date: Fri, 10 Oct 2014 18:29:43 +0000 (+0300)
Subject: #11694: merge with 3.4
X-Git-Tag: v3.5.0a1~706
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=221439dd618ae531d2a7c2636d2649521eb10db1;p=python

#11694: merge with 3.4
---

221439dd618ae531d2a7c2636d2649521eb10db1
diff --cc Misc/NEWS
index 9c655573cc,c490be5a3d..856a62af17
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -169,13 -24,9 +169,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11694: Raise ConversionError in xdrlib as documented.  Patch
+   by Filip Gruszczyński and Claudiu Popa.
+ 
 +- Issue #19380: Optimized parsing of regular expressions.
 +
 +- Issue #1519638: Now unmatched groups are replaced with empty strings in re.sub()
 +  and re.subn().
 +
 +- Issue #18615: sndhdr.what/whathdr now return a namedtuple.
 +
  - Issue #22462: Fix pyexpat's creation of a dummy frame to make it
    appear in exception tracebacks.