diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-05-12 00:08:34 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-05-12 00:08:34 +0000 |
| commit | 42bfa90f02f0055ea163df9103ebed873ee1dbb0 (patch) | |
| tree | 21b36e7ba36b42f58780624d900a5ca68d33a31f /Lib/test | |
| parent | b61d801adbb7dd13ed1f2706fe537cae970bcfa6 (diff) | |
| download | cpython-git-42bfa90f02f0055ea163df9103ebed873ee1dbb0.tar.gz | |
Depreate imageop for removal in 3.0.
Diffstat (limited to 'Lib/test')
| -rwxr-xr-x | Lib/test/test_imageop.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py index 3b14357483..8cd2dc11bd 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 85a772d612..a4c24d4182 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -132,8 +132,7 @@ class TestStdlibRemovals(unittest.TestCase): '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 |