summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2015-10-30 14:41:06 -0700
committerBrett Cannon <brett@python.org>2015-10-30 14:41:06 -0700
commit213b4056a64a670587419c8a15a724faeb789221 (patch)
treebef9c3f645c5c40644ac9baa169b8544b066ea6d /Lib/modulefinder.py
parentMerge with 3.5 (diff)
downloadcpython-213b4056a64a670587419c8a15a724faeb789221.tar.gz
cpython-213b4056a64a670587419c8a15a724faeb789221.tar.bz2
cpython-213b4056a64a670587419c8a15a724faeb789221.zip
Issue #25487: Fix tests not updated when the imp module moved to a
DeprecationWarning. Thanks to Martin Panter for finding the tests.
Diffstat (limited to 'Lib/modulefinder.py')
-rw-r--r--Lib/modulefinder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 50f2462da01..4a2f1b54911 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.