Upgrade the imp module's deprecation to DeprecationWarning.

python · Oct 16, 2015 · c0d91af · c0d91af
1 parent aa15ea4
commit c0d91af
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -30,7 +30,7 @@
 
 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
@@ -180,7 +180,7 @@ def _iter_file_finder_modules(importer, prefix=''):
 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
@@ -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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.
@@ Expand Down @@