diff options
| author | Fred Drake <fdrake@acm.org> | 2008-05-17 20:30:04 +0000 |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2008-05-17 20:30:04 +0000 |
| commit | 9bf64aea714ac094464343eb2416e46c5866f4ac (patch) | |
| tree | 8a4270f8a0a92d387dd2ab235dd76a6d4facf100 | |
| parent | b2e088a1bb9b31340eadd5db9af6e5f09dc57e27 (diff) | |
| download | cpython-9bf64aea714ac094464343eb2416e46c5866f4ac.tar.gz | |
rename HTMLParser to html.parser, htmlentitydefs to html.entities
(http://bugs.python.org/issue2882)
| -rw-r--r-- | Lib/html/__init__.py | 1 | ||||
| -rw-r--r-- | Lib/html/entities.py (renamed from Lib/htmlentitydefs.py) | 0 | ||||
| -rw-r--r-- | Lib/html/parser.py (renamed from Lib/HTMLParser.py) | 0 | ||||
| -rw-r--r-- | Lib/lib-old/HTMLParser.py | 8 | ||||
| -rw-r--r-- | Lib/lib-old/htmlentitydefs.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
7 files changed, 23 insertions, 0 deletions
diff --git a/Lib/html/__init__.py b/Lib/html/__init__.py new file mode 100644 index 0000000000..196d378857 --- /dev/null +++ b/Lib/html/__init__.py @@ -0,0 +1 @@ +# This directory is a Python package. diff --git a/Lib/htmlentitydefs.py b/Lib/html/entities.py index 3dd14a79fa..3dd14a79fa 100644 --- a/Lib/htmlentitydefs.py +++ b/Lib/html/entities.py diff --git a/Lib/HTMLParser.py b/Lib/html/parser.py index 2cbc2ecbc7..2cbc2ecbc7 100644 --- a/Lib/HTMLParser.py +++ b/Lib/html/parser.py diff --git a/Lib/lib-old/HTMLParser.py b/Lib/lib-old/HTMLParser.py new file mode 100644 index 0000000000..ae42e0f0a5 --- /dev/null +++ b/Lib/lib-old/HTMLParser.py @@ -0,0 +1,8 @@ +from warnings import warnpy3k + +warnpy3k(("The HTMLParser module has been renamed to html.parser" + " in Python 3.0"), stacklevel=2) + +from sys import modules +import html.parser +modules["HTMLParser"] = html.parser diff --git a/Lib/lib-old/htmlentitydefs.py b/Lib/lib-old/htmlentitydefs.py new file mode 100644 index 0000000000..340b6234ed --- /dev/null +++ b/Lib/lib-old/htmlentitydefs.py @@ -0,0 +1,8 @@ +from warnings import warnpy3k + +warnpy3k(("The htmlentitydefs module has been renamed to html.entities" + " in Python 3.0"), stacklevel=2) + +from sys import modules +import html.entities +modules["htmlentitydefs"] = html.entities diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 2c8f509e60..1a65323e4c 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -209,11 +209,13 @@ class TestStdlibRemovals(unittest.TestCase): class TestStdlibRenames(unittest.TestCase): renames = {'copy_reg': 'copyreg', 'Queue': 'queue', + 'htmlentitydefs': 'html.entities', 'SocketServer': 'socketserver', 'ConfigParser': 'configparser', 'repr': 'reprlib', 'FileDialog': 'tkinter.filedialog', 'FixTk': 'tkinter._fix', + 'HTMLParser': 'html.parser', 'ScrolledText': 'tkinter.scrolledtext', 'SimpleDialog': 'tkinter.simpledialog', 'Tix': 'tkinter.tix', @@ -48,6 +48,10 @@ Extension Modules Library ------- +- Issue #2882: The htmlentitydefs module has been renamed to 'html.entities' + and HTMLParser has been renamed to 'html.parser'; the old names have been + deprecated and will be removed in Python 3.0. + - Issue #961805: Fix Text.edit_modified() in Tkinter. - Issue #1793: Function ctypes.util.find_msvcrt() added that returns |