[Python-checkins] r63873 - in python/trunk: Doc/library/htmllib.rst Doc/library/sgmllib.rst Lib/htmllib.py Lib/sgmllib.py Lib/test/test_htmllib.py Lib/test/test_py3kwarn.py Lib/test/test_sgmllib.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Sun Jun  1 23:19:14 2008
New Revision: 63873

Log:
Deprecate htmllib and sgmllib for 3.0.


Modified:
   python/trunk/Doc/library/htmllib.rst
   python/trunk/Doc/library/sgmllib.rst
   python/trunk/Lib/htmllib.py
   python/trunk/Lib/sgmllib.py
   python/trunk/Lib/test/test_htmllib.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Lib/test/test_sgmllib.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Doc/library/htmllib.rst
==============================================================================
--- python/trunk/Doc/library/htmllib.rst	(original)
+++ python/trunk/Doc/library/htmllib.rst	Sun Jun  1 23:19:14 2008
@@ -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::

Modified: python/trunk/Doc/library/sgmllib.rst
==============================================================================
--- python/trunk/Doc/library/sgmllib.rst	(original)
+++ python/trunk/Doc/library/sgmllib.rst	Sun Jun  1 23:19:14 2008
@@ -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
 

Modified: python/trunk/Lib/htmllib.py
==============================================================================
--- python/trunk/Lib/htmllib.py	(original)
+++ python/trunk/Lib/htmllib.py	Sun Jun  1 23:19:14 2008
@@ -4,6 +4,11 @@
 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

Modified: python/trunk/Lib/sgmllib.py
==============================================================================
--- python/trunk/Lib/sgmllib.py	(original)
+++ python/trunk/Lib/sgmllib.py	Sun Jun  1 23:19:14 2008
@@ -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
 

Modified: python/trunk/Lib/test/test_htmllib.py
==============================================================================
--- python/trunk/Lib/test/test_htmllib.py	(original)
+++ python/trunk/Lib/test/test_htmllib.py	Sun Jun  1 23:19:14 2008
@@ -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):

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sun Jun  1 23:19:14 2008
@@ -137,7 +137,7 @@
     # 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',

Modified: python/trunk/Lib/test/test_sgmllib.py
==============================================================================
--- python/trunk/Lib/test/test_sgmllib.py	(original)
+++ python/trunk/Lib/test/test_sgmllib.py	Sun Jun  1 23:19:14 2008
@@ -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):

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Jun  1 23:19:14 2008
@@ -70,8 +70,11 @@
 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.