revert creation of the html.entities and html.parser modules
(http://bugs.python.org/issue2882)
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
index b5010ac..2cbc2ec 100644
--- a/Lib/html/parser.py
+++ b/Lib/html/parser.py
@@ -372,17 +372,16 @@
c = int(s)
return unichr(c)
else:
- # Cannot use name2codepoint directly, because HTMLParser
- # supports apos, which is not part of HTML 4
- import html.entities
+ # Cannot use name2codepoint directly, because HTMLParser supports apos,
+ # which is not part of HTML 4
+ import htmlentitydefs
if HTMLParser.entitydefs is None:
entitydefs = HTMLParser.entitydefs = {'apos':u"'"}
- for k, v in html.entities.name2codepoint.iteritems():
+ for k, v in htmlentitydefs.name2codepoint.iteritems():
entitydefs[k] = unichr(v)
try:
return self.entitydefs[s]
except KeyError:
return '&'+s+';'
- return re.sub(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));",
- replaceEntities, s)
+ return re.sub(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));", replaceEntities, s)