summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-15 03:44:00 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-15 03:44:00 (GMT)
commit89f5d9cc81f0963f4ae72cc5db6ad73bdce04305 (patch)
tree750759cbb718fe8a5cf8c979b30e11b38576be2f
parentd8c41ecc1770d6661273a56cf77c177fb6291b30 (diff)
downloadcpython-89f5d9cc81f0963f4ae72cc5db6ad73bdce04305.zip
cpython-89f5d9cc81f0963f4ae72cc5db6ad73bdce04305.tar.gz
cpython-89f5d9cc81f0963f4ae72cc5db6ad73bdce04305.tar.bz2
Deprecate jpeg for IRIX for removal in 3.0.
-rwxr-xr-xLib/plat-irix5/jpeg.py3
-rw-r--r--Lib/plat-irix6/jpeg.py3
-rw-r--r--Lib/test/test_py3kwarn.py2
-rw-r--r--Misc/NEWS2
4 files changed, 9 insertions, 1 deletions
diff --git a/Lib/plat-irix5/jpeg.py b/Lib/plat-irix5/jpeg.py
index f8fc7e7..944ce93 100755
--- 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 0b52031..38d781c 100644
--- 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 f8e3961..84e03ec 100644
--- 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 4fcb224..1e7fe91 100644
--- 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.