From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 8 Feb 2014 13:20:58 +0000 (+1000)
Subject: Merge fix for #18805 from 3.3
X-Git-Tag: v3.4.0rc1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aad0ea0b598e30cdef66b7c7fd3c605044c30557;p=thirdparty%2FPython%2Fcpython.git

Merge fix for #18805 from 3.3
---

aad0ea0b598e30cdef66b7c7fd3c605044c30557
diff --cc Misc/NEWS
index 998d87c8f843,4df6c23682fc..92d668ca99a6
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -27,15 -48,9 +27,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #18805: the netmask/hostmask parsing in ipaddress now more reliably
+   filters out illegal values
+ 
 +- Issue #20481: For at least Python 3.4, the statistics module will require
 +  that all inputs for a single operation be of a single consistent type, or
 +  else a mixed of ints and a single other consistent type. This avoids
 +  some interoperability issues that arose with the previous approach of
 +  coercing to a suitable common type.
 +
 +- Issue #20478: the statistics module now treats collections.Counter inputs
 +  like any other iterable.
 +
  - Issue #17369: get_filename was raising an exception if the filename
    parameter's RFC2231 encoding was broken in certain ways.  This was
    a regression relative to python2.