PendingDeprecationWarning -> DeprecationWarning. Both of these were

properly documented as being deprecated in 3.1.

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 2fd26b1f3d502e92694225a98838fc4a6b7371e1..d16b6646eea2fd14860f0fa4685e7bb983776471 100644 (file)
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -233,7 +233,7 @@ def splitunc(p):
     """
     import warnings
     warnings.warn("ntpath.splitunc is deprecated, use ntpath.splitdrive instead",
-                  PendingDeprecationWarning)
+                  DeprecationWarning)
     sep = _get_sep(p)
     if not p[1:2]:
         return p[:0], p # Drive letter present

diff --git a/Lib/unittest.py b/Lib/unittest.py
index ce990b78510289762a48acd60b858cb7b92985c9..611088bb4e8ecdf0b83eb67bb6c3bc5e65ae2580 100644 (file)
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -680,7 +680,7 @@ class TestCase(object):
         def deprecated_func(*args, **kwargs):
             warnings.warn(
                 'Please use {0} instead.'.format(original_func.__name__),
-                PendingDeprecationWarning, 2)
+                DeprecationWarning, 2)
             return original_func(*args, **kwargs)
         return deprecated_func