Issue #25487: Fix tests not updated when the imp module moved to a

DeprecationWarning.

Thanks to Martin Panter for finding the tests.

diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 50f2462da01fa7819eb99f8ff3fcfddf9dc0d613..4a2f1b5491186a7e48fe49ab41734a71cc02adbc 100644 (file)
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -10,7 +10,7 @@ import types
 import struct
 import warnings
 with warnings.catch_warnings():
-    warnings.simplefilter('ignore', PendingDeprecationWarning)
+    warnings.simplefilter('ignore', DeprecationWarning)
     import imp
 
 # XXX Clean up once str8's cstor matches bytes.

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index ee9ee1ad8c3bcc1237ac1339679e4cd1d8645cb4..efb03840c41c4be041b2f22da9f9ddb62b24fc78 100644 (file)
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -12,7 +12,7 @@ from test import support
 import unittest
 import warnings
 with warnings.catch_warnings():
-    warnings.simplefilter('ignore', PendingDeprecationWarning)
+    warnings.simplefilter('ignore', DeprecationWarning)
     import imp