From: Brett Cannon <brett@python.org>
Date: Fri, 30 Oct 2015 21:41:06 +0000 (-0700)
Subject: Issue #25487: Fix tests not updated when the imp module moved to a
X-Git-Tag: v3.6.0a1~1150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=213b4056a64a670587419c8a15a724faeb789221;p=thirdparty%2FPython%2Fcpython.git

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 50f2462da01f..4a2f1b549118 100644
--- 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 ee9ee1ad8c3b..efb03840c41c 100644
--- 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