From c0d91aff9a3b91307b26e8b7c34dfbf27bbdd43a Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 16 Oct 2015 12:21:37 -0700 Subject: [PATCH] Upgrade the imp module's deprecation to DeprecationWarning. --- Doc/whatsnew/3.6.rst | 3 +++ Lib/imp.py | 2 +- Lib/pkgutil.py | 2 +- Misc/NEWS | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index edacea12e6a..b3742807019 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -228,6 +228,9 @@ Changes in the Python API now raises :exc:`ValueError` for out-of-range values, rather than returning :const:`None`. See :issue:`20059`. +* The :mod:`imp` module now raises a :exc:`DeprecationWarning` instead of + :exc:`PendingDeprecationWarning`. + Changes in the C API -------------------- diff --git a/Lib/imp.py b/Lib/imp.py index f6fff442013..b33995267b8 100644 --- a/Lib/imp.py +++ b/Lib/imp.py @@ -30,7 +30,7 @@ import warnings warnings.warn("the imp module is deprecated in favour of importlib; " "see the module's documentation for alternative uses", - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) # DEPRECATED SEARCH_ERROR = 0 diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index fc4a074f5b8..203d515e5eb 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -180,7 +180,7 @@ iter_importer_modules.register( def _import_imp(): global imp with warnings.catch_warnings(): - warnings.simplefilter('ignore', PendingDeprecationWarning) + warnings.simplefilter('ignore', DeprecationWarning) imp = importlib.import_module('imp') class ImpImporter: diff --git a/Misc/NEWS b/Misc/NEWS index bcc85a755c0..6e3e2c32c8f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -63,6 +63,8 @@ Core and Builtins Library ------- +- Move the imp module from a PendingDeprecationWarning to DeprecationWarning. + - Issue #25407: Remove mentions of the formatter module being removed in Python 3.6.