diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:39:38 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:39:38 -0800 |
| commit | 1a5780aabb550cae175ad8711e2f33ba644d0ddb (patch) | |
| tree | 68e47eaafb4ccc17bbdb7668c6058984945b332d /Lib/modulefinder.py | |
| parent | 956c7cfa7111ab5458e2f69868a05b7b84fc6843 (diff) | |
| parent | d1d8706cdb77e2adbbb4110338dcda0e1811f892 (diff) | |
| download | cpython-1a5780aabb550cae175ad8711e2f33ba644d0ddb.tar.gz | |
Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
Diffstat (limited to 'Lib/modulefinder.py')
| -rw-r--r-- | Lib/modulefinder.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index 8103502404..e220315253 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 LOAD_CONST = dis.opmap['LOAD_CONST'] @@ -336,8 +336,7 @@ class ModuleFinder: fullname = name + "." + sub self._add_badmodule(fullname, caller) - def scan_opcodes_25(self, co, - unpack = struct.unpack): + def scan_opcodes(self, co): # Scan the code, and yield 'interesting' opcode combinations code = co.co_code names = co.co_names @@ -360,7 +359,7 @@ class ModuleFinder: def scan_code(self, co, m): code = co.co_code - scanner = self.scan_opcodes_25 + scanner = self.scan_opcodes for what, args in scanner(co): if what == "store": name, = args |