From ac19d85e04855642a856473b91f3d621e844ad52 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 1 Jun 2008 21:19:14 +0000
Subject: Deprecate htmllib and sgmllib for 3.0.

---
 Doc/library/htmllib.rst   | 5 ++++-
 Doc/library/sgmllib.rst   | 6 ++++--
 Lib/htmllib.py            | 5 +++++
 Lib/sgmllib.py            | 5 +++++
 Lib/test/test_htmllib.py  | 2 +-
 Lib/test/test_py3kwarn.py | 2 +-
 Lib/test/test_sgmllib.py  | 2 +-
 Misc/NEWS                 | 7 +++++--
 8 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Doc/library/htmllib.rst b/Doc/library/htmllib.rst
index aa07fdb..0fa518e 100644
--- a/Doc/library/htmllib.rst
+++ b/Doc/library/htmllib.rst
@@ -1,9 +1,12 @@
-
 :mod:`htmllib` --- A parser for HTML documents
 ==============================================
 
 .. module:: htmllib
    :synopsis: A parser for HTML documents.
+   :deprecated:
+   
+.. deprecated:: 2.6
+    The :mod:`htmllib` module has been removed in Python 3.0.
 
 
 .. index::
diff --git a/Doc/library/sgmllib.rst b/Doc/library/sgmllib.rst
index c0ef1a2..93c0cde 100644
--- a/Doc/library/sgmllib.rst
+++ b/Doc/library/sgmllib.rst
@@ -1,10 +1,12 @@
-
 :mod:`sgmllib` --- Simple SGML parser
 =====================================
 
 .. module:: sgmllib
    :synopsis: Only as much of an SGML parser as needed to parse HTML.
-
+   :deprecated:
+   
+.. deprecated:: 2.6
+    The :mod:`sgmllib` module has been removed in Python 3.0.
 
 .. index:: single: SGML
 
diff --git a/Lib/htmllib.py b/Lib/htmllib.py
index 24a2e2f..44647db 100644
--- a/Lib/htmllib.py
+++ b/Lib/htmllib.py
@@ -4,6 +4,11 @@ See the HTML 2.0 specification:
 http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html
 """
 
+from warnings import warnpy3k
+warnpy3k("the htmllib module has been removed in Python 3.0",
+         stacklevel=2)
+del warnpy3k
+
 import sgmllib
 
 from formatter import AS_IS
diff --git a/Lib/sgmllib.py b/Lib/sgmllib.py
index b68eb7a..e5fbd32 100644
--- a/Lib/sgmllib.py
+++ b/Lib/sgmllib.py
@@ -9,6 +9,11 @@
 # not supported at all.
 
 
+from warnings import warnpy3k
+warnpy3k("the sgmllib module has been removed in Python 3.0",
+         stacklevel=2)
+del warnpy3k
+
 import markupbase
 import re
 
diff --git a/Lib/test/test_htmllib.py b/Lib/test/test_htmllib.py
index a20f43b..e1f4334 100644
--- a/Lib/test/test_htmllib.py
+++ b/Lib/test/test_htmllib.py
@@ -1,8 +1,8 @@
 import formatter
-import htmllib
 import unittest
 
 from test import test_support
+htmllib = test_support.import_module('htmllib', deprecated=True)
 
 
 class AnchorCollector(htmllib.HTMLParser):
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index eed46d1..664df44 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -137,7 +137,7 @@ class TestStdlibRemovals(unittest.TestCase):
     # import side-effect.
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
                         'Bastion', 'compiler', 'dircache', 'fpformat',
-                        'ihooks', 'mhlib', 'statvfs')
+                        'ihooks', 'mhlib', 'statvfs', 'htmllib', 'sgmllib')
     inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
diff --git a/Lib/test/test_sgmllib.py b/Lib/test/test_sgmllib.py
index d9c9ddc..34fd7f0 100644
--- a/Lib/test/test_sgmllib.py
+++ b/Lib/test/test_sgmllib.py
@@ -1,8 +1,8 @@
 import pprint
 import re
-import sgmllib
 import unittest
 from test import test_support
+sgmllib = test_support.import_module('sgmllib', deprecated=True)
 
 
 class EventCollector(sgmllib.SGMLParser):
diff --git a/Misc/NEWS b/Misc/NEWS
index 155ade0..f8e2983 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,8 +70,11 @@ Extension Modules
 Library
 -------
 
-- Issue #3011: locale module alias table was updated to the latest version
-  from the X.org locale.alias file
+- The sgmllib and htmllib modules have been deprecated for removal
+  in Python 3.0.
+
+- Issue #3011: locale module alias table was updated to the latest
+  version from the X.org locale.alias file.
 
 - Issue #1797 (partial fix): ctypes NULL function pointers have a
   False boolean value now.
-- 
cgit v0.12