Depreate imageop for removal in 3.0.
diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py
index 3b14357..8cd2dc1 100755
--- a/Lib/test/test_imageop.py
+++ b/Lib/test/test_imageop.py
@@ -5,11 +5,10 @@
Roger E. Masse
"""
-from test.test_support import verbose, unlink
+from test.test_support import verbose, unlink, import_module
-import imageop, uu, os, imgfile
-
-import warnings
+imageop = import_module('imageop', deprecated=True)
+import uu, os, imgfile
def test_main():
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 85a772d..a4c24d4 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -132,8 +132,7 @@
'Bastion', 'compiler', 'dircache', 'fpformat',
'ihooks', 'mhlib')
inclusive_platforms = {'irix':('pure',)}
- # XXX Don't know if lib-tk is only installed if _tkinter is built.
- optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev')
+ optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop')
def check_removal(self, module_name, optional=False):
"""Make sure the specified module, when imported, raises a