diff options
author | Georg Brandl <georg@python.org> | 2007-10-24 18:55:37 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2007-10-24 18:55:37 (GMT) |
commit | bd1c68c94f0d5bc25b48f62c7527f51c754f2b6b (patch) | |
tree | a468fcccf4193f6d26ce71246e2596de6ffc9eec /Lib/modulefinder.py | |
parent | 97f9d4f31224e72e5c714ea7e509c4fd0044f0e2 (diff) | |
download | cpython-bd1c68c94f0d5bc25b48f62c7527f51c754f2b6b.zip cpython-bd1c68c94f0d5bc25b48f62c7527f51c754f2b6b.tar.gz cpython-bd1c68c94f0d5bc25b48f62c7527f51c754f2b6b.tar.bz2 |
Patch #1303: Adapt str8 constructor to bytes (now buffer) one.
Diffstat (limited to 'Lib/modulefinder.py')
-rw-r--r-- | Lib/modulefinder.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index cd9906c..cc5ad19 100644 --- a/Lib/modulefinder.py +++ b/Lib/modulefinder.py @@ -17,12 +17,12 @@ else: READ_MODE = "r" # XXX Clean up once str8's cstor matches bytes. -LOAD_CONST = str8(chr(dis.opname.index('LOAD_CONST'))) -IMPORT_NAME = str8(chr(dis.opname.index('IMPORT_NAME'))) -STORE_NAME = str8(chr(dis.opname.index('STORE_NAME'))) -STORE_GLOBAL = str8(chr(dis.opname.index('STORE_GLOBAL'))) +LOAD_CONST = str8([dis.opname.index('LOAD_CONST')]) +IMPORT_NAME = str8([dis.opname.index('IMPORT_NAME')]) +STORE_NAME = str8([dis.opname.index('STORE_NAME')]) +STORE_GLOBAL = str8([dis.opname.index('STORE_GLOBAL')]) STORE_OPS = [STORE_NAME, STORE_GLOBAL] -HAVE_ARGUMENT = str8(chr(dis.HAVE_ARGUMENT)) +HAVE_ARGUMENT = str8([dis.HAVE_ARGUMENT]) # Modulefinder does a good job at simulating Python's, but it can not # handle __path__ modifications packages make at runtime. Therefore there @@ -368,7 +368,7 @@ class ModuleFinder: consts = co.co_consts LOAD_LOAD_AND_IMPORT = LOAD_CONST + LOAD_CONST + IMPORT_NAME while code: - c = str8(chr(code[0])) + c = str8([code[0]]) if c in STORE_OPS: oparg, = unpack('<H', code[1:3]) yield "store", (names[oparg],) |