diff options
| -rw-r--r-- | Lib/modulefinder.py | 22 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index 478c749..646a785 100644 --- a/Lib/modulefinder.py +++ b/Lib/modulefinder.py @@ -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: @@ -54,6 +54,8 @@ Core and Builtins Library ------- +- Close file objects in modulefinder in a timely manner. + - Close a io.TextIOWrapper object in email.parser in a timely manner. - Close a file object in distutils.sysconfig in a timely manner. |