[Python-checkins] r63007 - in python/trunk: Doc/library/dl.rst Lib/test/test_dl.py Lib/test/test_py3kwarn.py Modules/dlmodule.c

[brett.cannon]

Author: brett.cannon
Date: Sat May 10 23:20:19 2008
New Revision: 63007

Log:
Deprecate the dl module for removal in 3.0.


Modified:
   python/trunk/Doc/library/dl.rst
   python/trunk/Lib/test/test_dl.py
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Modules/dlmodule.c

Modified: python/trunk/Doc/library/dl.rst
==============================================================================
--- python/trunk/Doc/library/dl.rst	(original)
+++ python/trunk/Doc/library/dl.rst	Sat May 10 23:20:19 2008
@@ -5,6 +5,11 @@
 .. module:: dl
    :platform: Unix
    :synopsis: Call C functions in shared objects.
+   :deprecated:
+   
+.. deprecated:: 2.6
+    The dl module has been removed in Python 3.0.
+   
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
 
 The :mod:`dl` module defines an interface to the :cfunc:`dlopen` function, which

Modified: python/trunk/Lib/test/test_dl.py
==============================================================================
--- python/trunk/Lib/test/test_dl.py	(original)
+++ python/trunk/Lib/test/test_dl.py	Sat May 10 23:20:19 2008
@@ -2,9 +2,8 @@
 """Test dlmodule.c
    Roger E. Masse  revised strategy by Barry Warsaw
 """
-
-import dl
-from test.test_support import verbose,TestSkipped
+from test.test_support import verbose,TestSkipped, import_module
+dl = import_module('dl', deprecated=True)
 
 sharedlibs = [
     ('/usr/lib/libc.so', 'getpid'),

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Sat May 10 23:20:19 2008
@@ -132,7 +132,7 @@
                         'Bastion', 'compiler', 'dircache')
     inclusive_platforms = {'irix':('pure',)}
     # XXX Don't know if lib-tk is only installed if _tkinter is built.
-    optional_modules = ('bsddb185', 'Canvas')
+    optional_modules = ('bsddb185', 'Canvas', 'dl')
 
     def check_removal(self, module_name, optional=False):
         """Make sure the specified module, when imported, raises a

Modified: python/trunk/Modules/dlmodule.c
==============================================================================
--- python/trunk/Modules/dlmodule.c	(original)
+++ python/trunk/Modules/dlmodule.c	Sat May 10 23:20:19 2008
@@ -235,6 +235,10 @@
 {
 	PyObject *m, *d, *x;
 
+    if (PyErr_WarnPy3k("the dl module has been removed in "
+                       "Python 3.0", 2) < 0)
+        return;    
+
 	/* Initialize object type */
 	Py_TYPE(&Dltype) = &PyType_Type;