summaryrefslogtreecommitdiff
path: root/Lib/modulefinder.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/modulefinder.py')
-rw-r--r--Lib/modulefinder.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index 50f2462da0..d8d645c77b 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -10,15 +10,15 @@ 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.
-LOAD_CONST = bytes([dis.opname.index('LOAD_CONST')])
-IMPORT_NAME = bytes([dis.opname.index('IMPORT_NAME')])
-STORE_NAME = bytes([dis.opname.index('STORE_NAME')])
-STORE_GLOBAL = bytes([dis.opname.index('STORE_GLOBAL')])
-STORE_OPS = [STORE_NAME, STORE_GLOBAL]
+LOAD_CONST = bytes([dis.opmap['LOAD_CONST']])
+IMPORT_NAME = bytes([dis.opmap['IMPORT_NAME']])
+STORE_NAME = bytes([dis.opmap['STORE_NAME']])
+STORE_GLOBAL = bytes([dis.opmap['STORE_GLOBAL']])
+STORE_OPS = STORE_NAME, STORE_GLOBAL
HAVE_ARGUMENT = bytes([dis.HAVE_ARGUMENT])
# Modulefinder does a good job at simulating Python's, but it can not