#670664: merge with 3.2.

diff --cc Misc/NEWS
index 94f22fcf95fce374b0a08d71c5ea4f5b6af63f0f,657c80290d1db042ff4d6ad9ddf39b1b3f22e0c7..133b8ba4b62e4042ad169dbb5f91b65ff001c89b
--- 1/Misc/NEWS
--- 2/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.