From: Ned Deily <nad@acm.org>
Date: Sun, 9 Mar 2014 21:47:58 +0000 (-0700)
Subject: Issue #20875: Merge from 3.3
X-Git-Tag: v3.4.1rc1~233^2~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5127299c86666080c50e8b7c76e70c3b968ada2;p=python

Issue #20875: Merge from 3.3
---

e5127299c86666080c50e8b7c76e70c3b968ada2
diff --cc Misc/NEWS
index 4f7328cc22,7baa0f7df5..68cb3790ab
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -20,10 -13,9 +20,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #20875: Prevent possible gzip "'read' is not defined" NameError.
+   Patch by Claudiu Popa.
+ 
 +- Issue #11558: ``email.message.Message.attach`` now returns a more
 +  useful error message if ``attach`` is called on a message for which
 +  ``is_multipart`` is False.
 +
  - Issue #20283: RE pattern methods now accept the string keyword parameters
    as documented.  The pattern and source keyword parameters are left as
    deprecated aliases.