[Python-checkins] cpython (merge default -> default): Merge.

[charles-francois.natali]

http://hg.python.org/cpython/rev/9ea84f006892
changeset:   83585:9ea84f006892
parent:      83584:538055b28ba6
parent:      83582:9af3f6af9a71
user:        Charles-Francois Natali <cf.natali at gmail.com>
date:        Wed May 01 15:15:50 2013 +0200
summary:
  Merge.

files:
  Lib/html/parser.py |  2 ++
  Misc/NEWS          |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/html/parser.py b/Lib/html/parser.py
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -12,6 +12,8 @@
 import re
 import warnings
 
+__all__ = ['HTMLParser']
+
 # Regular expressions used for parsing
 
 interesting_normal = re.compile('[&<]')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,8 @@
 Library
 -------
 
+- Issue #14679: add an __all__ (that contains only HTMLParser) to html.parser.
+
 - 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.
 

-- 
Repository URL: http://hg.python.org/cpython