[Python-checkins] cpython: Issue #17314: Stop using imp in multiprocessing.forking and move over

[brett.cannon]

http://hg.python.org/cpython/rev/97adaa820353
changeset:   84049:97adaa820353
user:        Brett Cannon <brett at python.org>
date:        Fri Jun 07 11:45:41 2013 -0400
summary:
  Issue #17314: Stop using imp in multiprocessing.forking and move over
to importlib.

files:
  Lib/multiprocessing/forking.py |  22 ++++++++++++----------
  Misc/NEWS                      |   2 ++
  2 files changed, 14 insertions(+), 10 deletions(-)


diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -450,6 +450,7 @@
             # 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 @@
 
             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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -112,6 +112,8 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython