summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-06-30 05:33:50 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-06-30 05:33:50 (GMT)
commitaa3b5b857791052e4e22a137f8315992c389f6f4 (patch)
treed0f4321a2311b34bb3c090b25a12715f592f5c2a
parent84ec8d931404f4f9037242ec933fdcdcd4870114 (diff)
downloadcpython-aa3b5b857791052e4e22a137f8315992c389f6f4.zip
cpython-aa3b5b857791052e4e22a137f8315992c389f6f4.tar.gz
cpython-aa3b5b857791052e4e22a137f8315992c389f6f4.tar.bz2
PendingDeprecationWarning -> DeprecationWarning. Both of these were
properly documented as being deprecated in 3.1.
-rw-r--r--Lib/ntpath.py2
-rw-r--r--Lib/unittest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 2fd26b1..d16b664 100644
--- 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 ce990b7..611088b 100644
--- 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