[Python-checkins] r63225 - in python/trunk: Lib/plat-irix5/CD.py Lib/plat-irix6/CD.py Lib/test/test_py3kwarn.py Misc/NEWS Modules/cdmodule.c
brett.cannon
python-checkins at python.org
Wed May 14 22:31:39 CEST 2008
Author: brett.cannon
Date: Wed May 14 22:31:38 2008
New Revision: 63225
Log:
The CD and cd modules for IRIX are deprecated for 3.0.
Modified:
python/trunk/Lib/plat-irix5/CD.py
python/trunk/Lib/plat-irix6/CD.py
python/trunk/Lib/test/test_py3kwarn.py
python/trunk/Misc/NEWS
python/trunk/Modules/cdmodule.c
Modified: python/trunk/Lib/plat-irix5/CD.py
==============================================================================
--- python/trunk/Lib/plat-irix5/CD.py (original)
+++ python/trunk/Lib/plat-irix5/CD.py Wed May 14 22:31:38 2008
@@ -1,3 +1,7 @@
+from warnings import warnpy3k
+warnpy3k("the CD module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
ERROR = 0
NODISC = 1
READY = 2
Modified: python/trunk/Lib/plat-irix6/CD.py
==============================================================================
--- python/trunk/Lib/plat-irix6/CD.py (original)
+++ python/trunk/Lib/plat-irix6/CD.py Wed May 14 22:31:38 2008
@@ -1,3 +1,7 @@
+from warnings import warnpy3k
+warnpy3k("the CD module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
+
ERROR = 0
NODISC = 1
READY = 2
Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py (original)
+++ python/trunk/Lib/test/test_py3kwarn.py Wed May 14 22:31:38 2008
@@ -131,7 +131,7 @@
all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
'Bastion', 'compiler', 'dircache', 'fpformat',
'ihooks', 'mhlib')
- inclusive_platforms = {'irix' : ('pure', 'AL', 'al'),
+ inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd'),
'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
'icglue', 'Nav', 'MacOS', 'aepack',
'aetools', 'aetypes', 'applesingle',
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Wed May 14 22:31:38 2008
@@ -32,6 +32,9 @@
Library
-------
+- The cd and CD modules for IRIX have been deprecated for removal in
+ Python 3.0.
+
- The al and AL modules for IRIX have been deprecated for removal in
Python 3.0.
Modified: python/trunk/Modules/cdmodule.c
==============================================================================
--- python/trunk/Modules/cdmodule.c (original)
+++ python/trunk/Modules/cdmodule.c Wed May 14 22:31:38 2008
@@ -758,6 +758,10 @@
initcd(void)
{
PyObject *m, *d;
+
+ if (PyErr_WarnPy3k("the cd module has been removed in "
+ "Python 3.0", 2) < 0)
+ return;
m = Py_InitModule("cd", CD_methods);
if (m == NULL)
More information about the Python-checkins
mailing list