mirror of
https://github.com/python/cpython.git
synced 2024-11-24 02:15:30 +08:00
Silence ResourceWarnings in modulefinder by using file context managers.
This commit is contained in:
parent
011057854d
commit
028011f9f0
@ -105,16 +105,16 @@ class ModuleFinder:
|
||||
|
||||
def run_script(self, pathname):
|
||||
self.msg(2, "run_script", pathname)
|
||||
fp = open(pathname, READ_MODE)
|
||||
stuff = ("", "r", imp.PY_SOURCE)
|
||||
self.load_module('__main__', fp, pathname, stuff)
|
||||
with open(pathname, READ_MODE) as fp:
|
||||
stuff = ("", "r", imp.PY_SOURCE)
|
||||
self.load_module('__main__', fp, pathname, stuff)
|
||||
|
||||
def load_file(self, pathname):
|
||||
dir, name = os.path.split(pathname)
|
||||
name, ext = os.path.splitext(name)
|
||||
fp = open(pathname, READ_MODE)
|
||||
stuff = (ext, "r", imp.PY_SOURCE)
|
||||
self.load_module(name, fp, pathname, stuff)
|
||||
with open(pathname, READ_MODE) as fp:
|
||||
stuff = (ext, "r", imp.PY_SOURCE)
|
||||
self.load_module(name, fp, pathname, stuff)
|
||||
|
||||
def import_hook(self, name, caller=None, fromlist=None, level=-1):
|
||||
self.msg(3, "import_hook", name, caller, fromlist, level)
|
||||
@ -451,9 +451,13 @@ class ModuleFinder:
|
||||
m.__path__ = m.__path__ + packagePathMap.get(fqname, [])
|
||||
|
||||
fp, buf, stuff = self.find_module("__init__", m.__path__)
|
||||
self.load_module(fqname, fp, buf, stuff)
|
||||
self.msgout(2, "load_package ->", m)
|
||||
return m
|
||||
try:
|
||||
self.load_module(fqname, fp, buf, stuff)
|
||||
self.msgout(2, "load_package ->", m)
|
||||
return m
|
||||
finally:
|
||||
if fp:
|
||||
fp.close()
|
||||
|
||||
def add_module(self, fqname):
|
||||
if fqname in self.modules:
|
||||
|
Loading…
Reference in New Issue
Block a user