Kaydet (Commit) d5a09852 authored tarafından Brett Cannon's avatar Brett Cannon

The Canvas module has been deprecated for removal in 3.0.

üst 756bc0b7
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
# NOTE: This module was an experiment and is now obsolete. # NOTE: This module was an experiment and is now obsolete.
# It's best to use the Tkinter.Canvas class directly. # It's best to use the Tkinter.Canvas class directly.
from warnings import warnpy3k
warnpy3k("the Canvas module has been removed in Python 3.0", stacklevel=2)
del warnpy3k
from Tkinter import Canvas, _cnfmerge, _flatten from Tkinter import Canvas, _cnfmerge, _flatten
......
...@@ -131,7 +131,8 @@ class TestStdlibRemovals(unittest.TestCase): ...@@ -131,7 +131,8 @@ class TestStdlibRemovals(unittest.TestCase):
all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec', all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
'Bastion', 'compiler') 'Bastion', 'compiler')
inclusive_platforms = {'irix':('pure',)} inclusive_platforms = {'irix':('pure',)}
optional_modules = ('bsddb185',) # XXX Don't know if lib-tk is only installed if _tkinter is built.
optional_modules = ('bsddb185', 'Canvas')
def check_removal(self, module_name, optional=False): def check_removal(self, module_name, optional=False):
"""Make sure the specified module, when imported, raises a """Make sure the specified module, when imported, raises a
......
...@@ -23,6 +23,8 @@ Extension Modules ...@@ -23,6 +23,8 @@ Extension Modules
Library Library
------- -------
- The Canvas module has been deprecated for removal in Python 3.0.
- The compiler package has been deprecated for removal in Python 3.0. - The compiler package has been deprecated for removal in Python 3.0.
- The Bastion and rexec modules have been deprecated for removal in Python 3.0. - The Bastion and rexec modules have been deprecated for removal in Python 3.0.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment