summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2015-10-30 21:41:06 (GMT)
committerBrett Cannon <brett@python.org>2015-10-30 21:41:06 (GMT)
commit213b4056a64a670587419c8a15a724faeb789221 (patch)
treebef9c3f645c5c40644ac9baa169b8544b066ea6d
parentc6d17c04bc94c690e9636cd6eb9b7a16f0496836 (diff)
downloadcpython-213b4056a64a670587419c8a15a724faeb789221.zip
cpython-213b4056a64a670587419c8a15a724faeb789221.tar.gz
cpython-213b4056a64a670587419c8a15a724faeb789221.tar.bz2
Issue #25487: Fix tests not updated when the imp module moved to a
DeprecationWarning. Thanks to Martin Panter for finding the tests.
-rw-r--r--Lib/modulefinder.py2
-rw-r--r--Lib/test/test_imp.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 50f2462..4a2f1b5 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 ee9ee1a..efb0384 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