From: Brett Cannon Date: Fri, 7 Jun 2013 15:45:41 +0000 (-0400) Subject: Issue #17314: Stop using imp in multiprocessing.forking and move over X-Git-Tag: v3.4.0a1~556 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a33e11e436de15baa1f0feb9d2d60d28f137eb3d;p=python Issue #17314: Stop using imp in multiprocessing.forking and move over to importlib. --- diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py index 37c9a10e7c..54c073dc17 100644 --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -450,6 +450,7 @@ def prepare(data): # Main modules not actually called __main__.py may # contain additional code that should still be executed import imp + import importlib if main_path is None: dirs = None @@ -460,16 +461,17 @@ def prepare(data): assert main_name not in sys.modules, main_name sys.modules.pop('__mp_main__', None) - file, path_name, etc = imp.find_module(main_name, dirs) + # We should not try to load __main__ + # since that would execute 'if __name__ == "__main__"' + # clauses, potentially causing a psuedo fork bomb. + loader = importlib.find_loader(main_name, path=dirs) + main_module = imp.new_module(main_name) try: - # We should not do 'imp.load_module("__main__", ...)' - # since that would execute 'if __name__ == "__main__"' - # clauses, potentially causing a psuedo fork bomb. - main_module = imp.load_module( - '__mp_main__', file, path_name, etc - ) - finally: - if file: - file.close() + loader.init_module_attrs(main_module) + except AttributeError: # init_module_attrs is optional + pass + main_module.__name__ = '__mp_main__' + code = loader.get_code(main_name) + exec(code, main_module.__dict__) sys.modules['__main__'] = sys.modules['__mp_main__'] = main_module diff --git a/Misc/NEWS b/Misc/NEWS index 84e913742d..df92935748 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -112,6 +112,8 @@ Core and Builtins Library ------- +- Issue #17314: Move multiprocessing.forking over to importlib. + - Issue #11959: SMTPServer and SMTPChannel now take an optional map, use of which avoids affecting global state.