[Python-checkins] r73700 - in python/branches/py3k/Lib: ntpath.py unittest.py

[gregory.p.smith]

Author: gregory.p.smith
Date: Tue Jun 30 07:33:50 2009
New Revision: 73700

Log:
PendingDeprecationWarning -> DeprecationWarning.  Both of these were
properly documented as being deprecated in 3.1.


Modified:
   python/branches/py3k/Lib/ntpath.py
   python/branches/py3k/Lib/unittest.py

Modified: python/branches/py3k/Lib/ntpath.py
==============================================================================
--- python/branches/py3k/Lib/ntpath.py	(original)
+++ python/branches/py3k/Lib/ntpath.py	Tue Jun 30 07:33:50 2009
@@ -233,7 +233,7 @@
     """
     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

Modified: python/branches/py3k/Lib/unittest.py
==============================================================================
--- python/branches/py3k/Lib/unittest.py	(original)
+++ python/branches/py3k/Lib/unittest.py	Tue Jun 30 07:33:50 2009
@@ -680,7 +680,7 @@
         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