(original) (raw)

changeset: 100941:423e2a96189e user: Victor Stinner victor.stinner@gmail.com date: Tue Apr 12 18:17:06 2016 +0200 files: Lib/modulefinder.py description: Issue #26647: Cleanup modulefinder Use directly dis.opmap[name] rather than dis.opname.index(name). Patch written by Demur Rumed. diff -r 7bf08a11d4c9 -r 423e2a96189e Lib/modulefinder.py --- a/Lib/modulefinder.py Tue Apr 12 18:15:26 2016 +0200 +++ b/Lib/modulefinder.py Tue Apr 12 18:17:06 2016 +0200 @@ -14,11 +14,11 @@ 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 /victor.stinner@gmail.com