[Python-checkins] cpython: issue #3035: update PendingDeprecationWarning to DeprectionWarning, point

[andrew.svetlov]

http://hg.python.org/cpython/rev/2bc374182ed4
changeset:   76009:2bc374182ed4
parent:      76007:ec99fd5b5e60
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Mar 31 14:55:55 2012 +0300
summary:
  issue #3035: update PendingDeprecationWarning to DeprectionWarning, point deprecation in tkinter doc

files:
  Doc/library/tkinter.rst |  21 +++++++++++++++------
  Lib/tkinter/__init__.py |  20 ++++++++++----------
  2 files changed, 25 insertions(+), 16 deletions(-)


diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -735,22 +735,32 @@
    displayed.  You can use these :mod:`tkinter` functions to access these special
    points in text widgets:
 
-   AtEnd()
+.. function:: AtEnd()
       refers to the last position in the text
 
-   AtInsert()
+   .. deprecated:: 3.3
+
+.. function:: AtInsert()
       refers to the point where the text cursor is
 
-   AtSelFirst()
+   .. deprecated:: 3.3
+
+.. function:: AtSelFirst()
       indicates the beginning point of the selected text
 
-   AtSelLast()
+   .. deprecated:: 3.3
+
+.. function:: AtSelLast()
       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
       case of a text entry widget, which contains a single line of text).
 
+   .. deprecated:: 3.3
+
 Text widget indexes
    The index notation for Text widgets is very rich and is best described in the Tk
    man pages.
@@ -798,4 +808,3 @@
 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
 wherever the image was used.
-
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -2126,14 +2126,14 @@
 # Indices:
 # XXX I don't like these -- take them away
 def AtEnd():
-    warnings.warn("tkinter.AtEnd will be removed in 3.5",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("tkinter.AtEnd will be removed in 3.4",
+                  DeprecationWarning, stacklevel=2)
     return 'end'
 
 
 def AtInsert(*args):
-    warnings.warn("tkinter.AtInsert will be removed in 3.5",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("tkinter.AtInsert will be removed in 3.4",
+                  DeprecationWarning, stacklevel=2)
     s = 'insert'
     for a in args:
         if a: s = s + (' ' + a)
@@ -2141,20 +2141,20 @@
 
 
 def AtSelFirst():
-    warnings.warn("tkinter.AtSelFirst will be removed in 3.5",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("tkinter.AtSelFirst will be removed in 3.4",
+                  DeprecationWarning, stacklevel=2)
     return 'sel.first'
 
 
 def AtSelLast():
-    warnings.warn("tkinter.AtSelLast will be removed in 3.5",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("tkinter.AtSelLast will be removed in 3.4",
+                  DeprecationWarning, stacklevel=2)
     return 'sel.last'
 
 
 def At(x, y=None):
-    warnings.warn("tkinter.At will be removed in 3.5",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("tkinter.At will be removed in 3.4",
+                  DeprecationWarning, stacklevel=2)
     if y is None:
         return '@%r' % (x,)
     else:

-- 
Repository URL: http://hg.python.org/cpython