issue #3035: update PendingDeprecationWarning to DeprectionWarning, point deprecation in tkinter doc

This commit is contained in:
Andrew Svetlov 2012-03-31 14:55:55 +03:00
parent 78a0f208cc
commit 69c2ffa3f3
2 changed files with 25 additions and 16 deletions

View File

@ -735,22 +735,32 @@ Entry widget indexes (index, view index, etc.)
displayed. You can use these :mod:`tkinter` functions to access these special displayed. You can use these :mod:`tkinter` functions to access these special
points in text widgets: points in text widgets:
AtEnd() .. function:: AtEnd()
refers to the last position in the text refers to the last position in the text
AtInsert() .. deprecated:: 3.3
.. function:: AtInsert()
refers to the point where the text cursor is refers to the point where the text cursor is
AtSelFirst() .. deprecated:: 3.3
.. function:: AtSelFirst()
indicates the beginning point of the selected text indicates the beginning point of the selected text
AtSelLast() .. deprecated:: 3.3
.. function:: AtSelLast()
denotes the last point of the selected text and finally denotes the last point of the selected text and finally
At(x[, y]) .. deprecated:: 3.3
.. function:: At(x[, y])
refers to the character at pixel location *x*, *y* (with *y* not used in the refers to the character at pixel location *x*, *y* (with *y* not used in the
case of a text entry widget, which contains a single line of text). case of a text entry widget, which contains a single line of text).
.. deprecated:: 3.3
Text widget indexes Text widget indexes
The index notation for Text widgets is very rich and is best described in the Tk The index notation for Text widgets is very rich and is best described in the Tk
man pages. man pages.
@ -798,4 +808,3 @@ some widget (e.g. labels, buttons, menus). In these cases, Tk will not keep a
reference to the image. When the last Python reference to the image object is reference to the image. When the last Python reference to the image object is
deleted, the image data is deleted as well, and Tk will display an empty box deleted, the image data is deleted as well, and Tk will display an empty box
wherever the image was used. wherever the image was used.

View File

@ -2126,14 +2126,14 @@ class Button(Widget):
# Indices: # Indices:
# XXX I don't like these -- take them away # XXX I don't like these -- take them away
def AtEnd(): def AtEnd():
warnings.warn("tkinter.AtEnd will be removed in 3.5", warnings.warn("tkinter.AtEnd will be removed in 3.4",
PendingDeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
return 'end' return 'end'
def AtInsert(*args): def AtInsert(*args):
warnings.warn("tkinter.AtInsert will be removed in 3.5", warnings.warn("tkinter.AtInsert will be removed in 3.4",
PendingDeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
s = 'insert' s = 'insert'
for a in args: for a in args:
if a: s = s + (' ' + a) if a: s = s + (' ' + a)
@ -2141,20 +2141,20 @@ def AtInsert(*args):
def AtSelFirst(): def AtSelFirst():
warnings.warn("tkinter.AtSelFirst will be removed in 3.5", warnings.warn("tkinter.AtSelFirst will be removed in 3.4",
PendingDeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
return 'sel.first' return 'sel.first'
def AtSelLast(): def AtSelLast():
warnings.warn("tkinter.AtSelLast will be removed in 3.5", warnings.warn("tkinter.AtSelLast will be removed in 3.4",
PendingDeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
return 'sel.last' return 'sel.last'
def At(x, y=None): def At(x, y=None):
warnings.warn("tkinter.At will be removed in 3.5", warnings.warn("tkinter.At will be removed in 3.4",
PendingDeprecationWarning, stacklevel=2) DeprecationWarning, stacklevel=2)
if y is None: if y is None:
return '@%r' % (x,) return '@%r' % (x,)
else: else: