Merge branch master into master-slp

Anselm Kruis · Anselm Kruis · commit 483d81b71e1e · 2017-10-07T17:34:09.000+02:00
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -909,7 +909,7 @@ def temp_dir(path=None, quiet=False):
         yield path
     finally:
         if dir_created and pid == os.getpid():
-            shutil.rmtree(path)
+            rmtree(path)
 
 @contextlib.contextmanager
 def change_cwd(path, quiet=False):
