From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 1 Nov 2011 12:14:15 +0000 (+0200)
Subject: #670664: merge with 3.2.
X-Git-Tag: v3.3.0a1~995
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7903913fa6a2904159cc1658f3471d2d2edde112;p=thirdparty%2FPython%2Fcpython.git

#670664: merge with 3.2.
---

7903913fa6a2904159cc1658f3471d2d2edde112
diff --cc Misc/NEWS
index 94f22fcf95fc,657c80290d1d..133b8ba4b62e
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -350,15 -66,15 +350,18 @@@ Core and Builtin
  Library
  -------
  
- - Issue 10817: Fix urlretrieve function to raise ContentTooShortError even
+ - Issue #670664: Fix HTMLParser to correctly handle the content of
+   ``<script>...</script>`` and ``<style>...</style>``.
+ 
+ - Issue #10817: Fix urlretrieve function to raise ContentTooShortError even
    when reporthook is None. Patch by Jyrki Pulliainen.
  
- - Issue 13296: Fix IDLE to clear compile __future__ flags on shell restart.
+ - Issue #13296: Fix IDLE to clear compile __future__ flags on shell restart.
    (Patch by Roger Serwy)
  
 +- Fix the xmlrpc.client user agent to return something similar to
 +  urllib.request user agent: "Python-xmlrpc/3.3".
 +
  - Issue #13293: Better error message when trying to marshal bytes using
    xmlrpc.client.