#17802: merge with 3.3.

diff --cc Lib/html/parser.py
Simple merge

diff --cc Misc/NEWS
index 3dce054e3bce675b45104052dcc493a1a0301d42,465ca10ff014d477876c9d37c16bfc5312fd876f..9b05fcb3022fe75a9439701b33dbf2e8e087e788
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -60,8 -44,13 +60,11 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #17192: Restore the patch for Issue #11729 which was ommitted in
 -  3.3.1 when updating the bundled version of libffi used by ctypes.  Update
 -  many libffi files that were missed in 3.3.1's update to libffi-3.0.13.
 -
 +- Issue #14679: add an __all__ (that contains only HTMLParser) to html.parser.
 +
+ - Issue #17802: Fix an UnboundLocalError in html.parser.  Initial tests by
+   Thomas Barlow.
+ 
  - Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by
    extention load_module()) now have a better chance of working when reloaded.