rename HTMLParser to html.parser and htmlentitydefs to html.entities;
includes merge of trunk revision 63432
diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index 12eb068..64d1645 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -1,5 +1,5 @@
import test.test_support, unittest
-import sys, codecs, htmlentitydefs, unicodedata
+import sys, codecs, html.entities, unicodedata
class PosReturn:
# this can be used for configurable callbacks
@@ -86,7 +86,7 @@
l = []
for c in exc.object[exc.start:exc.end]:
try:
- l.append("&%s;" % htmlentitydefs.codepoint2name[ord(c)])
+ l.append("&%s;" % html.entities.codepoint2name[ord(c)])
except KeyError:
l.append("&#%d;" % ord(c))
return ("".join(l), exc.end)
diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
index 48e9089..5508c9d 100644
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -74,7 +74,7 @@
if self.has_iso10646:
return
- from htmlentitydefs import codepoint2name
+ from html.entities import codepoint2name
def xmlcharnamereplace(exc):
if not isinstance(exc, UnicodeEncodeError):
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index dd81e5b..1b6069d 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -48,7 +48,7 @@
import encodings
import formatter
import getpass
- import htmlentitydefs
+ import html.entities
import imghdr
import keyword
import linecache