summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-Francois Natali <cf.natali@gmail.com>2013-05-01 13:15:50 (GMT)
committerCharles-Francois Natali <cf.natali@gmail.com>2013-05-01 13:15:50 (GMT)
commit8a42d601888e9f71e2c1fcfe93593c509f431c15 (patch)
tree0d95d3fee7d32c97ab465409968ebb4d7744ceac
parentf18a82d95631e5b746129d792adeb920360d4fdc (diff)
parent8dff4bd7afbec4ed446791209bf89f9ca6679336 (diff)
downloadcpython-8a42d601888e9f71e2c1fcfe93593c509f431c15.zip
cpython-8a42d601888e9f71e2c1fcfe93593c509f431c15.tar.gz
cpython-8a42d601888e9f71e2c1fcfe93593c509f431c15.tar.bz2
Merge.
-rw-r--r--Lib/html/parser.py2
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
index f8ac828..485f6fa 100644
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -12,6 +12,8 @@ import _markupbase
import re
import warnings
+__all__ = ['HTMLParser']
+
# Regular expressions used for parsing
interesting_normal = re.compile('[&<]')
diff --git a/Misc/NEWS b/Misc/NEWS
index ee4c73a9..3dce054 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,8 @@ Core and Builtins
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.