Deprecate jpeg for IRIX for removal in 3.0.

diff --git a/Lib/plat-irix5/jpeg.py b/Lib/plat-irix5/jpeg.py
index f8fc7e7210ba073ea3d743332c239abc102c53b5..944ce930e1e92d17cbd6ca8b97e4c2769ed81694 100755 (executable)
--- a/Lib/plat-irix5/jpeg.py
+++ b/Lib/plat-irix5/jpeg.py
@@ -4,6 +4,9 @@
 
 # XXX It appears that compressing grayscale images doesn't work right;
 # XXX the resulting file causes weirdness.
+from warnings import warnpy3k
+warnpy3k("the jpeg module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 class error(Exception):
     pass

diff --git a/Lib/plat-irix6/jpeg.py b/Lib/plat-irix6/jpeg.py
index 0b52031aa36e7f6ec6ffbee12df6346afb18f9ad..38d781c9012735ebcc9255e3963d1ab15938d277 100644 (file)
--- a/Lib/plat-irix6/jpeg.py
+++ b/Lib/plat-irix6/jpeg.py
@@ -4,6 +4,9 @@
 
 # XXX It appears that compressing grayscale images doesn't work right;
 # XXX the resulting file causes weirdness.
+from warnings import warnpy3k
+warnpy3k("the jpeg module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 class error(Exception):
     pass

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index f8e396151860dd9ef72843b0a635c3c3f5560716..84e03ecf2911777ddee883a0b9107a2068c2e215 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -135,7 +135,7 @@ class TestStdlibRemovals(unittest.TestCase):
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
                                      'fm', 'GET', 'GLWS', 'imgfile', 'IN',
-                                     'IOCTL'),
+                                     'IOCTL', 'jpeg'),
                           'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
                                       'icglue', 'Nav', 'MacOS', 'aepack',
                                       'aetools', 'aetypes', 'applesingle',

diff --git a/Misc/NEWS b/Misc/NEWS
index 4fcb224a1f3d3b8e01638994461de2fe18616a6b..1e7fe91117720b89d40268cbcc96055f530a1ee2 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- The jpeg module from IRIX has been deprecated for removal in Python 3.0.
+
 - The IOCTL module from IRIX has been deprecated for removal in Python 3.0.
 
 - The IN module from IRIX has been deprecated for removal in Python 3.0.